diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-12 15:18:47 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-12 15:18:47 +0000 |
| commit | 8150e9d8408885bf8b64c873a91d7c348ea8d4da (patch) | |
| tree | ec6f062a39dff298c0bbd6b44ca18de63e03a076 | |
| parent | 4717ddbf9becb79f6abe5a69f36253a57d53cb5d (diff) | |
| download | gcc-tarball-8150e9d8408885bf8b64c873a91d7c348ea8d4da.tar.gz | |
Remove -B from CPPFLAGS
We had to pass -BSYSROOT/PREFIX/include because it was the only way
to get GCC to look for headers inside a prefix that is inside a
sysroot. However, backporting a patch from GCC trunk to add the
--with-native-system-header-dir configure flag fixes this problem.
| -rw-r--r-- | stage2-gcc.morph | 2 | ||||
| -rw-r--r-- | stage2-gcc.morph.yaml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/stage2-gcc.morph b/stage2-gcc.morph index 511f923159..5d44b3c946 100644 --- a/stage2-gcc.morph +++ b/stage2-gcc.morph @@ -5,7 +5,7 @@ "stage2-eglibc-fix-specs", "cat \"gcc/limitx.h\" \"gcc/glimits.h\" \"gcc/limity.h\" > limits.h.tmp\nlibgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))\ncp limits.h.tmp \"$libgcc_dir/include-fixed/limits.h\"\n", "mkdir o", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc -B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT\"\nexport CC_FOR_TARGET=\"$TARGET_STAGE1-gcc -B$STAGE2_SYSROOT/tools\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure --prefix=\"$PREFIX\" --disable-nls \\\n `# [1]` --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n $TARGET_GCC_CONFIG \\\n --disable-bootstrap \\\n `# [2]` --enable-languages=c \\\n `# [3]` --with-local-prefix=$PREFIX \\\n `# [4]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n `# [5]` --libdir=$PREFIX/lib --disable-multilib --disable-libgomp \\\n --without-cloog --without-ppl \\\n --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n --enable-clocale=gnu --enable-shared --enable-threads=posix\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure --prefix=\"$PREFIX\" --disable-nls \\\n `# [1]` --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n $TARGET_GCC_CONFIG \\\n --disable-bootstrap \\\n `# [2]` --enable-languages=c \\\n `# [3]` --with-local-prefix=$PREFIX \\\n `# [4]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n `# [5]` --libdir=$PREFIX/lib --disable-multilib --disable-libgomp \\\n --without-cloog --without-ppl \\\n --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n --enable-clocale=gnu --enable-shared --enable-threads=posix\n" ], "build-commands": [ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\ncd o && make\n" diff --git a/stage2-gcc.morph.yaml b/stage2-gcc.morph.yaml index 1def5cb40e..e6d8979efe 100644 --- a/stage2-gcc.morph.yaml +++ b/stage2-gcc.morph.yaml @@ -40,8 +40,7 @@ configure-commands: # 5. Standard flags. See gcc.morph. - | export STAGE2_SYSROOT="$(dirname $(pwd))" - export CC="$TARGET_STAGE1-gcc -B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT" - export CC_FOR_TARGET="$TARGET_STAGE1-gcc -B$STAGE2_SYSROOT/tools" + export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT" export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" cd o && ../configure --prefix="$PREFIX" --disable-nls \ `# [1]` --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \ |