aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hadamik <stephanhadamik@gmail.com>2016-03-03 16:01:58 +0100
committerStephan Hadamik <stephanhadamik@gmail.com>2016-03-04 15:26:24 +0100
commit01a8a349a7989022c6b8c3fd5e3d2d5eb8a3af4e (patch)
tree300c74660d5bbb15e9fd94ce8980f6f31d4ec551
parentdf99b9ecd9697f5ef6abd099b64b599c10a8bd54 (diff)
[depends/openssl/ios] - configure for iphoneos-cross
-rw-r--r--tools/depends/target/openssl/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
index b3b0393721..a437e6ad79 100644
--- a/tools/depends/target/openssl/Makefile
+++ b/tools/depends/target/openssl/Makefile
@@ -13,9 +13,8 @@ ifeq ($(OS), android)
CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib linux-generic32
endif
ifeq ($(OS), ios)
- # No darwin-arm-cc so use darwin-i386-cc and patch files after configure
- CONFIGURE=./Configure darwin-i386-cc zlib no-asm no-krb5 --openssldir=$(PREFIX)
-endif
+ CONFIGURE=./Configure iphoneos-cross zlib no-asm no-krb5 --openssldir=$(PREFIX)
+ endif
ifeq ($(OS), osx)
ifeq ($(CPU),x86_64)
CONFIGURE=./Configure darwin64-$(CPU)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX)
@@ -44,7 +43,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
fi
if test "$(OS)" = "ios"; then \
sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \
- sed -ie "s|-arch i386|-arch $(CPU)|" "$(PLATFORM)/Makefile"; \
+ sed -ie "s|-isysroot \$$(CROSS_TOP)/SDKs/\$$(CROSS_SDK) ||" "$(PLATFORM)/Makefile"; \
sed -ie "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(PLATFORM)/crypto/ui/ui_openssl.c"; \
fi
sed -ie "s|apps test||" "$(PLATFORM)/Makefile"; \