[vlc-commits] contrib: live555: don't replace cc 2 times for macosx
Rafaël Carré
git at videolan.org
Tue Jan 24 19:31:56 CET 2012
vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 24 12:01:32 2012 -0500| [23df98e7772af2f77ed76df1092057df7bfdbf37] | committer: Jean-Baptiste Kempf
contrib: live555: don't replace cc 2 times for macosx
we could end up with 'ggcc'
forgotten in a6e2d06608df593af6118be34cc2f416d0c6d354
(cherry picked from commit a9739cc0a5ffe72aed386d50b9a08c5cce75d481)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=23df98e7772af2f77ed76df1092057df7bfdbf37
---
contrib/src/live555/rules.mak | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index be0c2b2..80bb137 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -36,7 +36,6 @@ endif
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
cd live && sed \
-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
- -e 's%cc%$(CC)%' \
-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
More information about the vlc-commits
mailing list