[vlc-commits] live555: use our compiler

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 22 04:15:56 2012 -0500| [e1f83663e1b2d4c3b083a9b234b17d0e36a7f85d] | committer: Jean-Baptiste Kempf

live555: use our compiler
(cherry picked from commit a6e2d06608df593af6118be34cc2f416d0c6d354)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/live555/rules.mak |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index b1af1e3..0507878 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -35,13 +35,12 @@ endif
 ifdef HAVE_WINCE
 	cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
 endif
-ifdef HAVE_MACOSX
+	cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -i.orig config.$(LIVE_TARGET)
 	cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
-endif
 	cd live && sed \
 		-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
 		-e 's%cc%$(CC)%' \
-		-e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' \
+		-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \
 		-i.orig config.macosx
 	cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
 	mv live $@