Mercurial > hg > mxe-octave-anirudha

changeset 3201:e62bfaade28d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[Darwin] Enable compilation of OpenSSL for 64-bit target
author Anirudha Bose <ani07nov@gmail.com>
date Fri, 13 Sep 2013 01:46:09 +0530
parents 5f79be06974b
children e3a857c4f6b7
files src/libvpx.mk src/openssl.mk
diffstat 2 files changed, 14 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -20,7 +20,7 @@
         CROSS='$(MXE_TOOL_PREFIX)' \
         ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --target=x86-win32-gcc \
+        --target=$(MXE_SYSTEM) \
         --disable-examples \
         --disable-install-docs
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -11,14 +11,19 @@
 $(PKG)_DEPS     := zlib libgcrypt
 
 $(PKG)_CC := $(MXE_CC) -I$(HOST_INCDIR) -L$(HOST_LIBDIR)
-ifeq ($(MXE_NATIVE_BUILD),yes)
-  ifeq ($(MXE_SYSTEM),msvc)
-    # Specifying -I and -L inteferes with possibly old installation
-    # because they appear before the standard -I. and -L. in the
-    # compilation/link command. These are not needed by clgcc anyway,
-    # so better discard them.
-    $(PKG)_CC := $(MXE_CC)
-    $(PKG)_CONFIGURE := ./Configure $(MXE_SYSTEM) --openssldir='$(HOST_PREFIX)/share/openssl'
+
+ifneq ($(filter darwin msvc,$(MXE_SYSTEM)),)
+  ifeq ($(MXE_NATIVE_BUILD),yes)
+    ifeq ($(MXE_SYSTEM),msvc)
+      # Specifying -I and -L inteferes with possibly old installation
+      # because they appear before the standard -I. and -L. in the
+      # compilation/link command. These are not needed by clgcc anyway,
+      # so better discard them.
+      $(PKG)_CC := $(MXE_CC)
+      $(PKG)_CONFIGURE := ./Configure $(MXE_SYSTEM) --openssldir='$(HOST_PREFIX)/share/openssl'
+    else
+      $(PKG)_CONFIGURE := ./Configure darwin64-x86_64-cc
+    endif
   else
     $(PKG)_CONFIGURE := ./config
   endif