# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1636049582 14400
# Node ID c2d5ce5da93d1c48e053845f7fc98e564f7e5397
# Parent  6c50286cc4405c7fb3b5ee524597ffae60afa633# Parent  0c39f5c55d1318a25de68f23de7d5c9b25030a72
maint: merge release to default.

diff -r 6c50286cc440 -r c2d5ce5da93d src/openblas.mk
--- a/src/openblas.mk	Tue Nov 02 11:47:48 2021 -0400
+++ b/src/openblas.mk	Thu Nov 04 14:13:02 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