diff options
| author | tron <tron@pkgsrc.org> | 2008-01-30 22:57:31 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-01-30 22:57:31 +0000 |
| commit | 5acb5cbde8921d8690b462a6475f06410daa9e36 (patch) | |
| tree | 7a34af8c17f63cda4288874493e3169024fc03a7 | |
| parent | bb453d0bb0c3cc1af41ef1762c2e725def1741aa (diff) | |
| download | pkgsrc-5acb5cbde8921d8690b462a6475f06410daa9e36.tar.gz | |
Try to fix PR pkg/26143 with caution:
- Set "CC" to "gcc -isystem /usr/include" during bootstrap.
- Add "-isystem /usr/include" to the Darwin specific "CPPFLAGS".
| -rwxr-xr-x | bootstrap/bootstrap | 3 | ||||
| -rw-r--r-- | mk/platform/Darwin.mk | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 0c547694afc..cbe5e450f11 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.119 2008/01/24 14:48:02 joerg Exp $ +# $NetBSD: bootstrap,v 1.120 2008/01/30 22:57:31 tron Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -442,6 +442,7 @@ Darwin) need_sed=no set_opsys=no machine_arch=`uname -p` + CC="gcc -isystem /usr/include"; export CC ;; DragonFly) root_group=wheel diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index a5395bdf237..6185c540290 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.28 2007/12/16 12:36:28 tron Exp $ +# $NetBSD: Darwin.mk,v 1.29 2008/01/30 22:57:42 tron Exp $ # # Variable definitions for the Darwin operating system. @@ -24,7 +24,9 @@ IMAKEOPTS+= -DInstallFlags=-c # do not set user or group .endif .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc) -CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp +# Use the GNU cpp, not the OS X cpp, don't look in "/usr/local/include" +# before "/usr/include". +CPP_PRECOMP_FLAGS?= -no-cpp-precomp -isystem /usr/include .endif DEF_UMASK?= 0022 DEFAULT_SERIAL_DEVICE?= /dev/null |