From ebe40444e72d30d4d18ffafe53665369a9b0d0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 2 Jun 2015 14:36:14 +0100 Subject: stage2-binutils: No need to disable c++ anymore We are generating a c++ compiler in stage 1, so no need to use the workaround introduced in commit e72775acb5326e948d2542622afb9bed4fd67c15 to be able to compile binutils without a c++ compiler This allows using upstream release tarballs of binutils, where before we had to patch out the AC_PROG_CXX statement from configure.in. Change-Id: I1ce9d2946f3a23a4355e8ec527a5ebfbce987d99 Conflicts: strata/build-essential/stage2-binutils.morph --- strata/build-essential/stage2-binutils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph index 8da663e4..70a2ef66 100644 --- a/strata/build-essential/stage2-binutils.morph +++ b/strata/build-essential/stage2-binutils.morph @@ -8,8 +8,8 @@ configure-commands: mips64*) ARCH_FLAGS="--with-arch=octeon2" ;; esac export STAGE2_SYSROOT="$(dirname $(pwd))" - export CXX=false TARGET_STAGE1=`echo $TARGET_STAGE1 | sed -e 's/bootstrap-linux-gnu/linux-musl/'` + export CXX="$TARGET_STAGE1-g++ --sysroot=$STAGE2_SYSROOT" # binutils has its own embedded libtool, which is old and strips out # `--sysroot`. Work around by modifying the compiler command to # include the sysroot flag -- cgit v1.2.1