refactor

Author: mattip

tools/build_openblas.sh

@@ -64,12 +64,14 @@ if [ "$build_bits" == 64 ]; then
     extra="-fno-asynchronous-unwind-tables"
     vc_arch="X64"
     plat_tag="win_amd64"
+    dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
 else
     march=pentium4
     extra="-mfpmath=sse -msse2"
     fextra="-m32"
     vc_arch="i386"
     plat_tag="win32"
+    dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
 fi
 cflags="-O2 -march=$march -mtune=generic $extra"
 fflags="$fextra $cflags -frecursive -ffpe-summary=invalid,zero"
@@ -95,7 +97,7 @@ OPENBLAS_VERSION=$(git describe --tags --abbrev=8)
 make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
      NUM_THREADS=24 NO_WARMUP=1 NO_AFFINITY=1 CONSISTENT_FPCSR=1 \
      BUILD_LAPACK_DEPRECATED=1 TARGET=PRESCOTT BUFFERSIZE=20 \
-     DYNAMIC_LIST="PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX" \
+     DYNAMIC_LIST=$dynamic_list \
      LDFLAGS="$LDFLAGS" \
      COMMON_OPT="$cflags" \
      FCOMMON_OPT="$fflags" \

tools/build_steps.sh

@@ -120,32 +120,35 @@ function do_build_lib {
     case $(get_os)-$plat in
         Linux-x86_64)
             local bitness=64
-            local target_flags="TARGET=PRESCOTT DYNAMIC_LIST=\"PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX\""
+            local target=PRESCOTT
+            local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
             ;;
         Darwin-x86_64)
             local bitness=64
-            local target_flags="TARGET=CORE2 DYNAMIC_LIST=\"CORE2 NEHALEM SANDYBRIDGE HASWELL SKYLAKEX\""
+            local target_flags=CORE2
+            local dynamic_list="CORE2 NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
             # Pick up the gfortran runtime libraries
             export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             ;;
         *-i686)
             local bitness=32
-            local target_flags="TARGET=PRESCOTT DYNAMIC_LIST=\"PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
+            local target_flags=PRESCOTT
+            local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
             ;;
         Linux-aarch64)
             local bitness=64
-            local target_flags="TARGET=ARMV8"
+            local target=ARMV8
             ;;
         Darwin-arm64)
             local bitness=64
-            local target_flags="TARGET=VORTEX"
+            local target=VORTEX
             ;;
         *-s390x)
             local bitness=64
             ;;
         *-ppc64le)
             local bitness=64
-            local target_flags="TARGET=POWER8"
+            local target=POWER8
             ;;
         *) echo "Strange plat value $plat"; exit 1 ;;
     esac
@@ -172,7 +175,8 @@ function do_build_lib {
     CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
     make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
         USE_OPENMP=0 NUM_THREADS=64 \
-        BINARY=$bitness $interface_flags $target_flags > /dev/null
+        BINARY=$bitness $interface_flags TARGET=$target \
+        DYNAMIC_LIST=$dynamic_list > /dev/null
     make PREFIX=$BUILD_PREFIX $interface_flags install
     popd
     stop_spinner