contribs: enforce usage of gcc-4.2 instead of llvm-gcc-4.2 for libx264 to ensure...

Binary packages will need an update here.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b93e5e398287ef4ceda7848bfbce582b81d1c941..a0cfd179ff7954e99367d90f24cdcc2d0e016ea8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -156,6 +156,10 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
+X264CC+= CC="/Developer/usr/bin/gcc-4.2"
+X264CC+= CXX="/Developer/usr/bin/g++-4.2"
+else
+X264CC+= $(HOSTCC)
 endif
 
 ifdef HAVE_AMR
@@ -1435,10 +1439,10 @@ ifdef HAVE_WIN32
 else
 ifdef HAVE_DARWIN_OS_ON_INTEL
   .x264: x264 .yasm
-       (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+       (cd $<; $(X264CC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
   .x264: x264
-       (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+       (cd $<; $(X264CC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 endif
 endif
        touch $@