diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-12 15:18:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-12 15:18:46 +0000 |
| commit | 633a53969ccfe977dc47923dd287a667aad372a8 (patch) | |
| tree | 407f7f38e937742450c6c2be623059ca7353bb52 | |
| parent | e72775acb5326e948d2542622afb9bed4fd67c15 (diff) | |
| download | binutils-redhat-633a53969ccfe977dc47923dd287a667aad372a8.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-binutils.morph | 4 | ||||
| -rw-r--r-- | stage2-binutils.morph.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stage2-binutils.morph b/stage2-binutils.morph index 5267f48245..c38a37bb40 100644 --- a/stage2-binutils.morph +++ b/stage2-binutils.morph @@ -4,9 +4,9 @@ "build-system": "autotools", "configure-commands": [ "stage2-eglibc-fix-specs", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n --with-lib-path=\"$PREFIX/lib\"\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \\\n --with-lib-path=\"$PREFIX/lib\"\n" ], "build-commands": [ - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n" ] } diff --git a/stage2-binutils.morph.yaml b/stage2-binutils.morph.yaml index c714a600df..e3d56bc563 100644 --- a/stage2-binutils.morph.yaml +++ b/stage2-binutils.morph.yaml @@ -7,7 +7,7 @@ configure-commands: - | export STAGE2_SYSROOT="$(dirname $(pwd))" - export CPPFLAGS="-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT" + export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ --build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \ @@ -19,6 +19,6 @@ build-commands: # TARGET_CPPFLAGS may be the answer) - | export STAGE2_SYSROOT="$(dirname $(pwd))" - export CPPFLAGS="-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT" + export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" make |