aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Eckels <eckels@google.com>2012-08-14 08:31:39 -0700
committerLucas Eckels <eckels@google.com>2012-08-14 08:52:49 -0700
commitd43abe883892fe84137052fd27ecd956a2c7cacf (patch)
treef5d561069a5ede1d17aae70c01666d1f7ebbd650
parent5f3a7e6f37a2ea3c02b88e524cb73d116ae57817 (diff)
downloadandroid_external_curl-d43abe883892fe84137052fd27ecd956a2c7cacf.tar.gz
android_external_curl-d43abe883892fe84137052fd27ecd956a2c7cacf.tar.bz2
android_external_curl-d43abe883892fe84137052fd27ecd956a2c7cacf.zip
Update curl paths in Mac build script.
Change-Id: I162dabc11344718284ec9d6efcb6bed1670d6a1b
-rwxr-xr-xMacBuild.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/MacBuild.sh b/MacBuild.sh
index 0687620..1dbd8f5 100755
--- a/MacBuild.sh
+++ b/MacBuild.sh
@@ -11,11 +11,11 @@ fi
rm -rf build install
mkdir -p build/ppc build/i386 install
cd build/ppc
-../../configure --disable-ldap --with-ssl=`pwd`/../../../openssl-0.9.8h --enable-static --disable-shared --target=powerpc-apple CFLAGS="-mmacosx-version-min=10.5 -arch ppc" CXXFLAGS="-mmacosx-version-min=10.5 -arch ppc" LDFLAGS="-mmacosx-version-min=10.5 -arch ppc" --prefix=`pwd`/../../install/ppc
+../../configure --disable-ldap --with-ssl=`pwd`/../../../openssl --enable-static --disable-shared --target=powerpc-apple CFLAGS="-mmacosx-version-min=10.5 -arch ppc" CXXFLAGS="-mmacosx-version-min=10.5 -arch ppc" LDFLAGS="-mmacosx-version-min=10.5 -arch ppc" --prefix=`pwd`/../../install/ppc
make
make install
cd ../i386
-../../configure --disable-ldap --with-ssl=`pwd`/../../../openssl-0.9.8h --enable-static --disable-shared --target=i386-apple CFLAGS="-mmacosx-version-min=10.5 -arch i386" CXXFLAGS="-mmacosx-version-min=10.5 -arch i386" LDFLAGS="-mmacosx-version-min=10.5 -arch i386" --prefix=`pwd`/../../install/i386
+../../configure --disable-ldap --with-ssl=`pwd`/../../../openssl --enable-static --disable-shared --target=i386-apple CFLAGS="-mmacosx-version-min=10.5 -arch i386" CXXFLAGS="-mmacosx-version-min=10.5 -arch i386" LDFLAGS="-mmacosx-version-min=10.5 -arch i386" --prefix=`pwd`/../../install/i386
make
make install
cd ../..
@@ -28,5 +28,5 @@ lipo -create ./install/ppc/lib/libcurl.a ./install/i386/lib/libcurl.a -output ./
ln -s i386/include install/include
# clean up
-git checkout -- include/curl/curlbuild.h
+/opt/local/bin/git checkout -- include/curl/curlbuild.h