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 | ee408cf414ccdc0abc424b5a6e472207c2ae2f4d (patch) | |
| tree | 43c81a655e6b4b0930d273b6d1dc3b67bfd42eef | |
| parent | a78d710eb7493cfcf21c8e9b24ec287ae6da7e43 (diff) | |
| download | busybox-ee408cf414ccdc0abc424b5a6e472207c2ae2f4d.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-busybox.morph | 4 | ||||
| -rw-r--r-- | stage2-busybox.morph.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/stage2-busybox.morph b/stage2-busybox.morph index 5d1801246..ec4a38912 100644 --- a/stage2-busybox.morph +++ b/stage2-busybox.morph @@ -38,9 +38,9 @@ "sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config" ], "build-commands": [ - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake HOSTCC=\"/usr/bin/gcc\" CROSS_COMPILE=$TARGET_STAGE1-\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake HOSTCC=\"/usr/bin/gcc\" CROSS_COMPILE=$TARGET_STAGE1-\n" ], "install-commands": [ - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nmake CONFIG_PREFIX=\"$DESTDIR$PREFIX\" \\\n HOSTCC=\"/usr/bin/gcc\" CROSS_COMPILE=$TARGET_STAGE1- install &&\nchmod 6755 \"$DESTDIR$PREFIX\"/bin/busybox\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake CONFIG_PREFIX=\"$DESTDIR$PREFIX\" \\\n HOSTCC=\"/usr/bin/gcc\" CROSS_COMPILE=$TARGET_STAGE1- install &&\nchmod 6755 \"$DESTDIR$PREFIX\"/bin/busybox\n" ] } diff --git a/stage2-busybox.morph.yaml b/stage2-busybox.morph.yaml index 4fbbbdc85..d2f0ec7af 100644 --- a/stage2-busybox.morph.yaml +++ b/stage2-busybox.morph.yaml @@ -58,7 +58,7 @@ configure-commands: build-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" make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- @@ -67,8 +67,8 @@ install-commands: # /usr). The install will break if prefix is set to /usr. - | export STAGE2_SYSROOT="$(dirname $(pwd))" - export CPPFLAGS="-B$STAGE2_SYSROOT/tools --sysroot=$STAGE2_SYSROOT" - export LDFLAGS="--sysroot=$STAGE2_SYSROOT" + export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" + export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" make CONFIG_PREFIX="$DESTDIR$PREFIX" \ HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox |