* Upgrade to gcc 3.3.3. Starting at 3.3.3, the gcc makefile checks
whether the system header file directory actually exists (when calling fixinc), so passing a non-existent directory no longer works. Instead we make a empty dummy directory. svn path=/nixpkgs/trunk/; revision=858
This commit is contained in:
@@ -3,6 +3,10 @@
|
||||
. $stdenv/setup
|
||||
|
||||
|
||||
FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
|
||||
mkdir $FIXINC_DUMMY
|
||||
|
||||
|
||||
preConfigure() {
|
||||
|
||||
if test "$noSysDirs" = "1"; then
|
||||
@@ -60,7 +64,7 @@ postConfigure() {
|
||||
# header files from /usr/include.
|
||||
mf=gcc/Makefile
|
||||
sed \
|
||||
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
|
||||
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \
|
||||
< $mf > $mf.tmp
|
||||
mv $mf.tmp $mf
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user