contrib/bootstrap: MacOSX, avoid multiple -isysroot definitions by using CC, CXX...

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index e062ae11f1d216c9f2932f34afea432c5eae5ef4..3fa6abe541496295077aeed0cbd6392dd7389975 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -106,8 +106,10 @@ case $HOST in
         echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
         echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
         CFLAGS_TUNING=" -arch ppc -mtune=G4"
-        EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+        EXTRA_CFLAGS=" -D\${ENVP} -mmacosx-version-min=\${SDK_TARGET}"
+        CC="gcc -isysroot \${MACOSX_SDK}"
+        CXX="g++ -isysroot \${MACOSX_SDK}"
+        LD="ld -arch ppc -syslibroot \${MACOSX_SDK}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
         ;;