diff options
| author | Stephan Hadamik <stephanhadamik@gmail.com> | 2016-03-09 09:30:24 +0100 |
|---|---|---|
| committer | Stephan Hadamik <stephanhadamik@gmail.com> | 2016-03-09 09:30:24 +0100 |
| commit | 94ba19a03f6330a0e9af5ab5e4b252a2f6366f71 (patch) | |
| tree | 01a38295bb4fb48333f38b04d18925c1d88860ae | |
| parent | 47685ffdee9feebd119d5d7283fc9285710591e6 (diff) | |
[depends/openssl] - indentation, comments
| -rw-r--r-- | tools/depends/target/openssl/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile index a437e6ad79..ae283269f6 100644 --- a/tools/depends/target/openssl/Makefile +++ b/tools/depends/target/openssl/Makefile @@ -14,7 +14,7 @@ ifeq ($(OS), android) endif ifeq ($(OS), ios) CONFIGURE=./Configure iphoneos-cross zlib no-asm no-krb5 --openssldir=$(PREFIX) - endif +endif ifeq ($(OS), osx) ifeq ($(CPU),x86_64) CONFIGURE=./Configure darwin64-$(CPU)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) @@ -33,9 +33,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - #when compiled on darwin it just won't realise that we do crosscompiling - #so it would stick in -arch i386 or -arch x86_64 into the cflags - #that would break the cross compile so we have to get rid of these cd $(PLATFORM); AR="$(AR)" CFLAGS="$(CFLAGS)" CC=$(CC) RANLIB=$(RANLIB) $(CONFIGURE) if test "$(OS)" = "osx"; then \ sed -ie "s|CC= /usr/bin/gcc-4.2|CC= $(CC)|" "$(PLATFORM)/Makefile"; \ @@ -43,6 +40,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) fi if test "$(OS)" = "ios"; then \ sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \ + # sysroot already set in Makefile.include, remove it 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 |