| 12345678910111213141516171819202122232425262728293031323334 |
- From bd9bc29764da7cdbe7a88f25b90f8c6e0b6aad01 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Sat, 20 Jul 2013 21:46:17 +0200
- Subject: [PATCH 12/12] contrib: export CCAS correctly
- ---
- contrib/src/main.mak | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
- diff --git a/contrib/src/main.mak b/contrib/src/main.mak
- index 69465e6..132ab7d 100644
- --- a/contrib/src/main.mak
- +++ b/contrib/src/main.mak
- @@ -131,6 +131,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 +250,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)" \
- --
- 1.8.3.1 (Apple Git-46)
|
