Commit b666a31e authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib: prevent some rare linking errors on OSX by providing the minimal OS...

contrib: prevent some rare linking errors on OSX by providing the minimal OS version also at link-time
parent 58037e25
...@@ -133,10 +133,10 @@ case $HOST in ...@@ -133,10 +133,10 @@ case $HOST in
HAVE_DARWIN_9=1 HAVE_DARWIN_9=1
CFLAGS_TUNING=" -arch ppc -mtune=G4" CFLAGS_TUNING=" -arch ppc -mtune=G4"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET} -Wl,-syslibroot,\${MACOSX_SDK}"
CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2" CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2" CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
LD="ld -arch ppc -syslibroot \${MACOSX_SDK}" LD="ld -arch ppc -syslibroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
cat src/Distributions/darwin.mak >> distro.mak cat src/Distributions/darwin.mak >> distro.mak
if test -e /Developer/SDKs; then if test -e /Developer/SDKs; then
...@@ -161,7 +161,7 @@ case $HOST in ...@@ -161,7 +161,7 @@ case $HOST in
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386" CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2" CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2" CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
...@@ -188,7 +188,7 @@ case $HOST in ...@@ -188,7 +188,7 @@ case $HOST in
CFLAGS_TUNING=" -march=prescott -mtune=core2" CFLAGS_TUNING=" -march=prescott -mtune=core2"
fi fi
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
CC="gcc" CC="gcc"
CXX="g++" CXX="g++"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment