diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-22 10:47:39 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-22 10:47:39 +0000 |
| commit | db3aed6856d7a23186844fdf93105cad2fcf2f2f (patch) | |
| tree | 02c35f39b3d37c83a89891e05c7007a21d4ae749 | |
| parent | fa888b66fc7707def0b0b96048e10cc5414f4656 (diff) | |
| parent | 9c2c3e2013acfc1b33f98f1f68b2afcff718a1bd (diff) | |
| download | zlib-baserock/build-essential.tar.gz | |
Merge system branch 'baserock/richardmaw/build-essential-changes-merge'baserock/build-essential
| -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 539a8ea..33e529d 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 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" + "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 -shared -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 c09e648..f440326 100644 --- a/stage2-zlib.morph.yaml +++ b/stage2-zlib.morph.yaml @@ -11,7 +11,7 @@ configure-commands: export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT" export CHOST=$TARGET_STAGE1 export CXX=false - export LDSHARED="$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT" + export LDSHARED="$TARGET_STAGE1-gcc -shared -Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" build-commands: |