diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-18 12:12:16 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-18 12:18:09 +0000 |
| commit | fa888b66fc7707def0b0b96048e10cc5414f4656 (patch) | |
| tree | e2592c75b13dc5f8d719ba247baa395c9d402029 | |
| parent | 831d02022a7dd74e256e2c46e60cb7160ae10270 (diff) | |
| download | zlib-fa888b66fc7707def0b0b96048e10cc5414f4656.tar.gz | |
Use CC instead of CFLAGS to set sysroot
This avoids passing --sysroot to GCC while linking, because if it is
given a sysroot it adds -L/usr and -L/usr/lib to the CFLAGS and this
isn't what we want during stage 2.
| -rw-r--r-- | stage2-zlib.morph | 2 | ||||
| -rw-r--r-- | stage2-zlib.morph.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stage2-zlib.morph b/stage2-zlib.morph index 8228d8c..539a8ea 100644 --- a/stage2-zlib.morph +++ b/stage2-zlib.morph @@ -4,7 +4,7 @@ "max-jobs": "1", "configure-commands": [ "stage2-eglibc-fix-specs", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CHOST=$TARGET_STAGE1\nexport CXX=false\nexport LDSHARED=\"$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\"\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport CHOST=$TARGET_STAGE1\nexport CXX=false\nexport LDSHARED=\"$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\"\n" ], "build-commands": [ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nmake\n" diff --git a/stage2-zlib.morph.yaml b/stage2-zlib.morph.yaml index 6ac073a..c09e648 100644 --- a/stage2-zlib.morph.yaml +++ b/stage2-zlib.morph.yaml @@ -8,7 +8,7 @@ configure-commands: # ZLib's configure is not a standard autoconf configure script - | export STAGE2_SYSROOT="$(dirname $(pwd))" - export CFLAGS="--sysroot=$STAGE2_SYSROOT" + export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT" export CHOST=$TARGET_STAGE1 export CXX=false export LDSHARED="$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT" |