changeset 3568:f44dd0186692

allow native unixy builds of openblas to work on 64-bit systems
author John W. Eaton <jwe@octave.org>
date Wed, 19 Mar 2014 12:38:42 -0400
parents 9735384a34fb
children c53ea91b338b
files src/openblas.mk
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/openblas.mk	Tue Mar 18 12:23:16 2014 -0400
+++ b/src/openblas.mk	Wed Mar 19 12:38:42 2014 -0400
@@ -17,9 +17,7 @@
 endif
 
 ifeq ($(ENABLE_64),yes)
-  $(PKG)_MAKE_OPTS += BINARY=64
-else
-  $(PKG)_MAKE_OPTS += BINARY=32
+  $(PKG)_MAKE_OPTS += BINARY=64 INTERFACE64=1
 endif
 
 define $(PKG)_UPDATE
@@ -30,7 +28,7 @@
 define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_OPTS)  
     $(MAKE) -C '$(1)' -j 1 PREFIX='$(HOST_PREFIX)' $($(PKG)_MAKE_OPTS) install
-    if [ $(BUILD_SHARED) = yes ]; then \
+    if [ $(MXE_WINDOWS_BUILD) = yes ] && [ $(BUILD_SHARED) = yes ]; then \
       $(INSTALL) -d $(HOST_BINDIR); \
       $(INSTALL) $(HOST_LIBDIR)/libopenblas.dll $(HOST_BINDIR)/; \
     fi