aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>2011-06-12 00:12:02 +0000
committereschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>2011-06-12 00:12:02 +0000
commit625fba01fecf0539ff81d8f2969a226a80b17cda (patch)
tree31521ff8a181675f229ccbca954eecc95b332c49
parentd51c1def5a0e9154f2e3afa8df51b717a15b9f60 (diff)
Disable parallel build
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@4 d47fded2-66c1-406f-af09-4fc0800f9c6b
-rw-r--r--zlib.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/zlib.sh b/zlib.sh
index c10c354..b294048 100644
--- a/zlib.sh
+++ b/zlib.sh
@@ -92,6 +92,11 @@ if [ -z "${ZLIB_DIR}" -o "${ZLIB_DIR}" = 'BUILD' ]; then
if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
export OBJECT_MODE=64
fi
+ # Disable parallel make. With parallel make, I sometimes
+ # encounter a build error "ld: in libz.a, malformed archive
+ # TOC entry for _zlibVersion, offset 824872 is beyond end of
+ # file 237568 for architecture x86_64"
+ unset MAKEFLAGS
echo "zlib: Preparing directory structure..."
mkdir build external done 2> /dev/null || true