Mercurial > mxe-octave

changeset 5940:0c39f5c55d13 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openblas: unconditionally use TARGET=GENERIC (bug #61246)
author John W. Eaton <jwe@octave.org>
date Thu, 04 Nov 2021 14:12:20 -0400
parents 6af36a510344
children c2d5ce5da93d 2ab80c855cb2
files src/openblas.mk
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/openblas.mk	Sat Oct 30 11:31:39 2021 -0400
+++ b/src/openblas.mk	Thu Nov 04 14:12:20 2021 -0400
@@ -26,7 +26,7 @@
 
 $(PKG)_MAKE_OPTS := \
   PREFIX=$(HOST_PREFIX) \
-  DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 \
+  DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 TARGET=GENERIC \
   NO_LAPACK=1 NO_CBLAS=1 \
   USE_THREAD=1 NUM_THREADS=24 \
   CC=$($(PKG)_MXE_CC) FC=$($(PKG)_MXE_F77)
@@ -36,18 +36,10 @@
   $(PKG)_MAKE_OPTS += HOSTCC=gcc HOSTFC=gfortran CROSS=1 CROSS_SUFFIX=$(MXE_TOOL_PREFIX)
 endif
 
-## Assume that native builds are for a 64bit target
-$(PKG)_TARGET := PRESCOTT
-
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_MAKE_OPTS += EXTRALIB=-lxerbla
-  ifneq ($(ENABLE_WINDOWS_64),yes)
-    $(PKG)_TARGET := KATMAI
-  endif
 endif
 
-$(PKG)_MAKE_OPTS += TARGET=$($(PKG)_TARGET)
-
 ifeq ($(ENABLE_FORTRAN_INT64),yes)
   $(PKG)_MAKE_OPTS += BINARY=64 INTERFACE64=1
 endif