[vlc-devel] commit: contribs: compilation fix for compilation in x86_64 mode on Darwin ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jun 13 12:19:35 2009 +0200| [ec2aed2f9c4ff02e9cd17f3d9bcc6b81b24110d0] | committer: 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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec2aed2f9c4ff02e9cd17f3d9bcc6b81b24110d0
---

 extras/contrib/bootstrap |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 0cb9e05..87cf4d1 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -73,15 +73,19 @@ fi
 case $HOST in
     *powerpc*|*ppc*)
          echo "ARCH=ppc" >> config.mak
+         ARCH="ppc"
      ;;
     *darwin10*)
          echo "ARCH=x86_64" >> config.mak
+         ARCH="x86_64"
      ;;
     *86_64*)
           echo "ARCH=x86_64" >> config.mak
+          ARCH="x86_64"
      ;;
     *86*)
           echo "ARCH=i386" >> config.mak
+          ARCH="i386"
      ;;
 esac
 
@@ -181,7 +185,11 @@ case $HOST in
         HAVE_DARWIN_10=1
         echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> 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_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak