old contribs: compilation fixes and compiler experiment

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 9d32354ec8846dce7b47f2e4ed9e184c12cbef51..f45a7217f70d9f6847f3d36fef7a1d6f8dd38d2d 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -320,12 +320,12 @@ case "$DISTRO" in
     add_makefile_cfg "IOS_SDK_ROOT = ${IOS_SDK_ROOT}"
     ;;
   macosx*)
-    SDK_TARGET=10.5
+    SDK_TARGET=10.6
     HAVE_MACOSX_DARWIN_9=1
     EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-    CC="/usr/bin/gcc"
-    CXX="/usr/bin/g++"
+    CC="/usr/bin/clang"
+    CXX="/usr/bin/clang++"
     LD="ld"
     RANLIB="ranlib"
     AR=

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 89012d45c3bf2042003259b20057ad0b3e205343..bf4ce38ab619ee2a2b79736696304cc8a9c216b7 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -847,8 +847,8 @@ VPX_TARGET-$(ENABLED)              = --target=FIXME
 VPX_TARGET-$(HAVE_LINUX)           =
 VPX_TARGET-$(HAVE_WIN32)           = --target=x86-win32-gcc
 VPX_TARGET-$(HAVE_DARWIN_OS)       = --target=ppc32-darwin9-gcc
-VPX_TARGET-$(HAVE_MACOSX_ON_INTEL) = --target=x86-darwin9-gcc
-VPX_TARGET-$(HAVE_MACOSX64)        = --target=x86_64-darwin9-gcc
+VPX_TARGET-$(HAVE_MACOSX_ON_INTEL) = --target=x86-darwin10-gcc
+VPX_TARGET-$(HAVE_MACOSX64)        = --target=x86_64-darwin10-gcc
 VPX_DEPS-$(ENABLED)                =
 VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm
 
@@ -948,6 +948,7 @@ FFMPEGCONF += --enable-cross-compile
 endif
 
 ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX
+ifndef HAVE_MACOSX
 ifndef HAVE_ANDROID
 ifndef HAVE_SYMBIAN
 FFMPEGCONF += --cross-prefix=$(HOST)-
@@ -960,6 +961,7 @@ FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv6
 FFMPEGCONF += $(FFMPEGCONFSMALL)
 endif
 endif
+endif
 
 ifdef CC
 FFMPEGCONF += --cc="$(CC)"
@@ -989,12 +991,12 @@ endif
 
 ifdef HAVE_MACOSX32
 FFMPEGCONF += --enable-libvpx
-FFMPEGCONF += --cc=gcc-4.2
+FFMPEGCONF += --cc=clang
 endif
 
 ifdef HAVE_MACOSX64
 FFMPEGCONF += --enable-libvpx
-FFMPEGCONF += --cc=gcc-4.2
+FFMPEGCONF += --cc=clang
 FFMPEGCONF += --cpu=core2
 endif