diff options
| author | davilla <davilla@4pi.com> | 2012-05-06 20:51:59 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2012-05-06 20:51:59 -0400 |
| commit | 65523b7db3ff65e3fd3de36cc2d5b17a8e76d578 (patch) | |
| tree | 3c8ea18c12bc77fa7abd609ebb944fbffde71bfa /tools/darwin/depends | |
| parent | cdb4527df0670ba5e7dd6f4fe11d1ef60a15545c (diff) | |
[osx/ios] prep for x86_64
Diffstat (limited to 'tools/darwin/depends')
| -rw-r--r-- | tools/darwin/depends/openssl/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/darwin/depends/openssl/Makefile b/tools/darwin/depends/openssl/Makefile index 5f814b0b2b..a7c72dcb19 100644 --- a/tools/darwin/depends/openssl/Makefile +++ b/tools/darwin/depends/openssl/Makefile @@ -12,7 +12,11 @@ ifeq ($(DARWIN), 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 shared --openssldir=$(PREFIX) else - CONFIGURE=./Configure darwin-$(ARCH)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) + ifeq ($(ARCH), x86_64) + CONFIGURE=./Configure darwin64-$(ARCH)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) + else + CONFIGURE=./Configure darwin-$(ARCH)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) + endif endif LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib @@ -27,6 +31,9 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore cd $(SOURCE); $(CONFIGURE) + if test "$(DARWIN)" = "osx"; then \ + sed -ie "s|CC= /usr/bin/gcc-4.2|CC= /usr/bin/gcc|" "$(SOURCE)/Makefile"; \ + fi if test "$(DARWIN)" = "ios"; then \ sed -ie "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${platform_sdk_path} |" "$(SOURCE)/Makefile"; \ sed -ie "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile"; \ |