mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
ddeaddf92d
IOS migration Conflicts: .gitignore .gitmodules linphone-Info.plist linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/build/iphone-config.site submodules/externals/osip submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone
25 lines
1 KiB
Diff
25 lines
1 KiB
Diff
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index 009a6c4..1cd1ea8 100755
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -729,7 +729,7 @@ process_common_toolchain() {
|
|
TOOLCHAIN_PATH=${SDK_PATH}/usr/bin
|
|
CC=${TOOLCHAIN_PATH}/gcc
|
|
AR=${TOOLCHAIN_PATH}/ar
|
|
- LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-gcc-4.2.1
|
|
+ LD=${TOOLCHAIN_PATH}/gcc
|
|
AS=${TOOLCHAIN_PATH}/as
|
|
STRIP=${TOOLCHAIN_PATH}/strip
|
|
NM=${TOOLCHAIN_PATH}/nm
|
|
@@ -741,9 +741,9 @@ process_common_toolchain() {
|
|
ASFLAGS="-version -arch ${tgt_isa} -g"
|
|
|
|
add_cflags -arch ${tgt_isa}
|
|
- add_ldflags -arch_only ${tgt_isa}
|
|
+ add_ldflags "-arch ${tgt_isa} -Wl,-syslibroot,${SDK_PATH}/SDKs/iPhoneOS5.0.sdk"
|
|
|
|
- add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS4.3.sdk"
|
|
+ add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk"
|
|
|
|
# This should be overridable
|
|
alt_libc=${SDK_PATH}/SDKs/iPhoneOS4.3.sdk
|