summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 15:39:43 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 15:39:43 +0000
commitd515f6a3e32426be6e355c005fb60987b94f2ea3 (patch)
tree172f8344c3886a8e5a707474655fe7570fdcc591
parent633a53969ccfe977dc47923dd287a667aad372a8 (diff)
downloadbinutils-redhat-d515f6a3e32426be6e355c005fb60987b94f2ea3.tar.gz
Prevent build from using g++ from host machine
Stage 1 does not build a C++ compiler, but autoconf configure scripts will happily use g++ from the host system instead. Force CXX=false to make sure that it doesn't try to build any C++ code.
-rw-r--r--stage2-binutils.morph2
-rw-r--r--stage2-binutils.morph.yaml1
2 files changed, 2 insertions, 1 deletions
diff --git a/stage2-binutils.morph b/stage2-binutils.morph
index c38a37bb40..32351e1787 100644
--- a/stage2-binutils.morph
+++ b/stage2-binutils.morph
@@ -4,7 +4,7 @@
"build-system": "autotools",
"configure-commands": [
"stage2-eglibc-fix-specs",
- "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"
+ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\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=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n"
diff --git a/stage2-binutils.morph.yaml b/stage2-binutils.morph.yaml
index e3d56bc563..f0d8809875 100644
--- a/stage2-binutils.morph.yaml
+++ b/stage2-binutils.morph.yaml
@@ -8,6 +8,7 @@ configure-commands:
- |
export STAGE2_SYSROOT="$(dirname $(pwd))"
export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+ export CXX=false
export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
./configure --prefix="$PREFIX" --disable-nls --disable-werror \
--build=$BUILD --host=$TARGET_STAGE1 --target=$TARGET_STAGE1 \