Mercurial > mxe-octave

diff src/blas.mk @ 2997:4f9b72cf7ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native builds too
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2013 17:31:59 -0400
parents c766e4afd493
children b6c7244a2f66
line wrap: on
line diff
--- a/src/blas.mk	Sun May 26 13:32:22 2013 -0400
+++ b/src/blas.mk	Tue May 28 17:31:59 2013 -0400
@@ -15,18 +15,11 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,$$(FORTRAN),$(TARGET)-gfortran,g' '$(1)/Makefile'
+    $(SED) -i 's,$$(FORTRAN),$(MXE_F77) $(MXE_F77_PICFLAG),g' '$(1)/Makefile'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
-    cd '$(1)' && $(TARGET)-ar cr libblas.a *.o
+    cd '$(1)' && $(MXE_AR) cr libblas.a *.o
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gfortran' '$(1)/libblas.a'; \
-    fi
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/libblas.a' '$(PREFIX)/$(TARGET)/lib/'
-    if [ $(BUILD_SHARED) = yes ]; then \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m755 '$(1)/libblas.dll.a' '$(PREFIX)/$(TARGET)/lib/libblas.dll.a'; \
-      $(INSTALL) -m755 '$(1)/libblas.dll' '$(PREFIX)/$(TARGET)/bin/libblas.dll'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \
     fi
 endef