witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix build for xcode4.4

Browse source
This commit is contained in:
Jehan Monnier 2012-09-18 15:04:47 +02:00
parent 20ef4a2469
commit 8a50dae15a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
submodules/build/builder-iphone-os.mk
View file

@ -307,6 +307,9 @@ multi-arch:
armv6_path= ; \
fi; \
armv7s_path=`echo $$archive | sed -e "s/armv7/armv7s/"` ;\
if test ! -f "$$armv7s_path"; then \
armv7s_path= ; \
fi; \
destpath=`echo $$archive | sed -e "s/armv7-//"` ;\
if test -f "$$i386_path"; then \
echo "Mixing $$archive into $$destpath"; \

4
submodules/build/builders.d/libvpx.patch
View file

@ -1,5 +1,5 @@
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 0426f92..d1f4760 100755
index 0426f92..38fdcb2 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -624,6 +624,9 @@ process_common_toolchain() {
@ -27,7 +27,7 @@ index 0426f92..d1f4760 100755
CC=${TOOLCHAIN_PATH}/gcc
AR=${TOOLCHAIN_PATH}/ar
- LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2
+ LD=${TOOLCHAIN_PATH}/ld
+ LD=${TOOLCHAIN_PATH}/gcc
AS=${TOOLCHAIN_PATH}/as
STRIP=${TOOLCHAIN_PATH}/strip
NM=${TOOLCHAIN_PATH}/nm