[vlc-commits] iOS: don't deploy xcrun as for Intel builds as this isn't needed
Felix Paul Kühne
git at videolan.org
Wed Feb 5 15:42:25 CET 2014
vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Feb 5 15:37:07 2014 +0100| [85aca9192006509c3d5ddfd110c57c83882d6684] | committer: Felix Paul Kühne
iOS: don't deploy xcrun as for Intel builds as this isn't needed
(cherry picked from commit 72013a5b4f565e8fbfe83369a4bfa76d0026fc1a)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=85aca9192006509c3d5ddfd110c57c83882d6684
---
contrib/src/main.mak | 1 -
extras/package/ios/build.sh | 1 -
2 files changed, 2 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 23a47e9..c261bad 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -133,7 +133,6 @@ AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
CCAS=gas-preprocessor.pl $(CC) -c
else
CCAS=$(CC) -c
-AS=xcrun as
endif
AR=xcrun ar
LD=xcrun ld
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index ae65a4b..32536ea 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -184,7 +184,6 @@ if [ "$PLATFORM" = "OS" ]; then
export GASPP_FIX_XCODE5=1
fi
else
- export AS="xcrun as"
export ASCPP="xcrun as"
fi
More information about the vlc-commits
mailing list