[vlc-devel] commit: contribs: enforce usage of gcc-4.2 instead of llvm-gcc-4. 2 for libx264 to ensure proper linking on both PPC and x86 based Macs ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat May 30 17:59:48 2009 +0200| [8114a97f9e0214ef14c69a9dace5073c2e6491ea] | committer: Felix Paul Kühne 

contribs: enforce usage of gcc-4.2 instead of llvm-gcc-4.2 for libx264 to ensure proper linking on both PPC and x86 based Macs

Binary packages will need an update here.

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

 extras/contrib/src/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b93e5e3..a0cfd17 100644
--- 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 $@