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

contribs: compilation fix for compilation in x86_64 mode on Darwin

'core2' is the first CPU generation on the Mac to support 64bit instructions, so we can't use 'prescott' in this mode.
parent cc6fce5b
...@@ -73,15 +73,19 @@ fi ...@@ -73,15 +73,19 @@ fi
case $HOST in case $HOST in
*powerpc*|*ppc*) *powerpc*|*ppc*)
echo "ARCH=ppc" >> config.mak echo "ARCH=ppc" >> config.mak
ARCH="ppc"
;; ;;
*darwin10*) *darwin10*)
echo "ARCH=x86_64" >> config.mak echo "ARCH=x86_64" >> config.mak
ARCH="x86_64"
;; ;;
*86_64*) *86_64*)
echo "ARCH=x86_64" >> config.mak echo "ARCH=x86_64" >> config.mak
ARCH="x86_64"
;; ;;
*86*) *86*)
echo "ARCH=i386" >> config.mak echo "ARCH=i386" >> config.mak
ARCH="i386"
;; ;;
esac esac
...@@ -181,7 +185,11 @@ case $HOST in ...@@ -181,7 +185,11 @@ case $HOST in
HAVE_DARWIN_10=1 HAVE_DARWIN_10=1
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk" >> config.mak echo "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk" >> config.mak
CFLAGS_TUNING=" -march=prescott -mtune=core2" if test $ARCH = "x86_64"; then
CFLAGS_TUNING=" -march=core2 -mtune=core2"
else
CFLAGS_TUNING=" -march=prescott -mtune=core2"
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}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
......
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