[vlc-commits] contrib: export CCAS correctly
Felix Paul Kühne
git at videolan.org
Tue Jul 23 18:25:46 CEST 2013
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jul 20 21:46:17 2013 +0200| [ba8cad3aeec119360a90794e5c6a69f53bf4f4bc] | committer: Rafaël Carré
contrib: export CCAS correctly
Modified-by: Rafaël Carré <funman at videolan.org>
Signed-off-by: Rafaël Carré <funman at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba8cad3aeec119360a90794e5c6a69f53bf4f4bc
---
contrib/src/main.mak | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 69465e6..2027af5 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -123,6 +123,8 @@ endif
endif
+CCAS=$(CC)
+
ifdef HAVE_IOS
CC=xcrun clang
CXX=xcrun clang++
@@ -131,6 +133,7 @@ AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
else
AS=xcrun as
endif
+CCAS=gas-preprocessor.pl $(CC)
AR=xcrun ar
LD=xcrun ld
STRIP=xcrun strip
@@ -249,7 +252,7 @@ endif
HOSTTOOLS := \
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
- AR="$(AR)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
+ AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
PATH="$(PREFIX)/bin:$(PATH)"
HOSTVARS := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
More information about the vlc-commits
mailing list