From e7390f278a77190cc31e51ecf1ef4310c26969ae Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 19 Dec 2007 23:58:31 +0000 Subject: [PATCH] Make curl, jpeg build scripts more robust svn path=/trunk/boinc/; revision=14417 --- mac_build/buildcurl.sh | 10 +++++----- mac_build/buildjpeg.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index 571f9b5331..54ed77165a 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -24,7 +24,7 @@ # use in building BOINC. # # by Charlie Fenton 7/21/06 -# Updated 12/18/07 +# Updated 12/19/07 # ## In Terminal, CD to the curl-7.17.1 directory. ## cd [path]/curl-7.17.1/ @@ -80,7 +80,7 @@ rm -f lib/.libs/libcurl_x86_64.a if [ $usegcc33 -ne 0 ]; then export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 -export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" @@ -90,7 +90,7 @@ if [ $? -ne 0 ]; then return 1; fi else export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk -arch ppc" @@ -111,7 +111,7 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk" @@ -147,7 +147,7 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" diff --git a/mac_build/buildjpeg.sh b/mac_build/buildjpeg.sh index 2e5dac2e1b..04217f957e 100644 --- a/mac_build/buildjpeg.sh +++ b/mac_build/buildjpeg.sh @@ -23,7 +23,7 @@ # Script to build Macintosh Universal Binary library of jpeg-6b for # use in building BOINC. # -# by Charlie Fenton 12/4/07 +# by Charlie Fenton 12/19/07 # ## In Terminal, CD to the jpeg-6b directory. ## cd [path]/jpeg-6b/ @@ -55,9 +55,9 @@ fi export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3 -export LDFLAGS="-arch ppc -D_NONSTD_SOURCE" -export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE" -export CFLAGS="-arch ppc -D_NONSTD_SOURCE" +export LDFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk" +export CPPFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" +export CFLAGS="-arch ppc -D_NONSTD_SOURCE -isystem /Developer/SDKs/MacOSX10.3.9.sdk" export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk" export MACOSX_DEPLOYMENT_TARGET=10.3 @@ -79,7 +79,7 @@ if [ $? -ne 0 ]; then return 1; fi ##export PATH=/usr/local/bin:$PATH export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0 -export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"