Revert "replace ARCH with AR in lapack-netlib"

This reverts commit db17ce896fbbf53cbef34f81e1f1ec6887965ec4.

diff --git a/Makefile b/Makefile
index aaeb0c4..c0e5fbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -237,8 +237,8 @@ ifndef NOFORTRAN
        -@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "AR          = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "ARFLAGS     = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
+       -@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
+       -@echo "ARCHFLAGS   = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "TMGLIB      = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc

diff --git a/c_check b/c_check
index f86a37b..c564855 100644 (file)
--- a/c_check
+++ b/c_check
@@ -121,10 +121,6 @@ if (($architecture eq "x86") && ($os ne Darwin) && ($os ne SunOS)) {
     $binary =32;
 }
 
-if ($architecture eq "riscv64") {
-    $defined = 1;
-}
-
 if ($compiler eq "PGI") {
     $compiler_name .= " -tp p7"    if ($binary eq "32");
     $compiler_name .= " -tp p7-64" if ($binary eq "64");

diff --git a/lapack-netlib/BLAS/SRC/Makefile b/lapack-netlib/BLAS/SRC/Makefile
index f723631..a436365 100644 (file)
--- a/lapack-netlib/BLAS/SRC/Makefile
+++ b/lapack-netlib/BLAS/SRC/Makefile
@@ -138,23 +138,23 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
        $(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
 
 $(BLASLIB): $(ALLOBJ)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
-       $(AR) $(ARFLAGS) $(BLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
        $(RANLIB) $(BLASLIB)
 
 double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3)
-       $(AR) $(ARFLAGS) $(BLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
        $(RANLIB) $(BLASLIB)
 
 complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3)
-       $(AR) $(ARFLAGS) $(BLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
        $(RANLIB) $(BLASLIB)
 
 complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
-       $(AR) $(ARFLAGS) $(BLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
        $(RANLIB) $(BLASLIB)
 
 FRC:

diff --git a/lapack-netlib/CBLAS/src/Makefile b/lapack-netlib/CBLAS/src/Makefile
index 9b9063d..6c0518a 100644 (file)
--- a/lapack-netlib/CBLAS/src/Makefile
+++ b/lapack-netlib/CBLAS/src/Makefile
@@ -45,22 +45,22 @@ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
 
 # Single precision real
 slib1: $(slev1) $(sclev1)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib1: $(dlev1)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib1: $(clev1) $(sclev1)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib1: $(zlev1)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 #
@@ -97,22 +97,22 @@ zlev2 = cblas_zgemv.o cblas_zgbmv.o cblas_zhemv.o cblas_zhbmv.o cblas_zhpmv.o \
 
 # Single precision real
 slib2: $(slev2) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib2: $(dlev2) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib2: $(clev2) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib2: $(zlev2) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 #
@@ -143,22 +143,22 @@ zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o \
 
 # Single precision real
 slib3: $(slev3) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision real
 dlib3: $(dlev3) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Single precision complex
 clib3: $(clev3) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # Double precision complex
 zlib3: $(zlev3) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 
@@ -168,22 +168,22 @@ alev3 = $(slev3) $(dlev3) $(clev3) $(zlev3)
 
 # All level 1
 all1: $(alev1)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # All level 2
 all2: $(alev2) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # All level 3
 all3: $(alev3) $(errhand)
-       $(AR) $(ARFLAGS) $(CBLASLIB) $^
+       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $^
        $(RANLIB) $(CBLASLIB)
 
 # All levels and precisions
 $(CBLASLIB): $(alev1) $(alev2) $(alev3) $(errhand)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 FRC:

diff --git a/lapack-netlib/DOCS/lawn81.tex b/lapack-netlib/DOCS/lawn81.tex
index 01c7c39..2917352 100644 (file)
--- a/lapack-netlib/DOCS/lawn81.tex
+++ b/lapack-netlib/DOCS/lawn81.tex
@@ -466,7 +466,7 @@ TIMER    = EXT_ETIME
 Refer to the section~\ref{second} to get more information.
 
 
-Next, you will need to modify \texttt{AR}, \texttt{ARFLAGS}, and \texttt{RANLIB} to specify archiver,
+Next, you will need to modify \texttt{ARCH}, \texttt{ARCHFLAGS}, and \texttt{RANLIB} to specify archiver,
 archiver options, and ranlib for your machine.  If your architecture
 does not require \texttt{ranlib} to be run after each archive command (as
 is the case with CRAY computers running UNICOS, Hewlett Packard

diff --git a/lapack-netlib/INSTALL/make.inc.ALPHA b/lapack-netlib/INSTALL/make.inc.ALPHA
index 049cf0b..0ceeaa1 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.ALPHA
+++ b/lapack-netlib/INSTALL/make.inc.ALPHA
@@ -29,8 +29,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.HPPA b/lapack-netlib/INSTALL/make.inc.HPPA
index 2bd8ee1..8eabbbd 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.HPPA
+++ b/lapack-netlib/INSTALL/make.inc.HPPA
@@ -29,8 +29,8 @@ LOADOPTS = -Aa +U77
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.IRIX64 b/lapack-netlib/INSTALL/make.inc.IRIX64
index 0f57941..d9e71e1 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.IRIX64
+++ b/lapack-netlib/INSTALL/make.inc.IRIX64
@@ -32,8 +32,8 @@ LOADOPTS = -O3 -64 -mips4 -r10000 -OPT:IEEE_NaN_inf=ON
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.O2K b/lapack-netlib/INSTALL/make.inc.O2K
index d99beca..3ffcada 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.O2K
+++ b/lapack-netlib/INSTALL/make.inc.O2K
@@ -32,8 +32,8 @@ LOADOPTS = -O3 -64 -mips4 -r10000
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.SGI5 b/lapack-netlib/INSTALL/make.inc.SGI5
index c4a702d..c7019ac 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.SGI5
+++ b/lapack-netlib/INSTALL/make.inc.SGI5
@@ -29,8 +29,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.SUN4 b/lapack-netlib/INSTALL/make.inc.SUN4
index 6a78e95..4e44f1b 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.SUN4
+++ b/lapack-netlib/INSTALL/make.inc.SUN4
@@ -29,8 +29,8 @@ LOADOPTS = -dalign -O4 -fast
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.SUN4SOL2 b/lapack-netlib/INSTALL/make.inc.SUN4SOL2
index 0ac3cc4..e6d79ad 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.SUN4SOL2
+++ b/lapack-netlib/INSTALL/make.inc.SUN4SOL2
@@ -33,8 +33,8 @@ LOADOPTS = -f -dalign -native -xO2 -xarch=v8plusa
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.XLF b/lapack-netlib/INSTALL/make.inc.XLF
index 27e22ca..9466ee3 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.XLF
+++ b/lapack-netlib/INSTALL/make.inc.XLF
@@ -30,8 +30,8 @@ LOADOPTS = -qnosave
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.gfortran b/lapack-netlib/INSTALL/make.inc.gfortran
index b342b18..39d98d4 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.gfortran
+++ b/lapack-netlib/INSTALL/make.inc.gfortran
@@ -33,8 +33,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.gfortran_debug b/lapack-netlib/INSTALL/make.inc.gfortran_debug
index 1eaed21..10e6381 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.gfortran_debug
+++ b/lapack-netlib/INSTALL/make.inc.gfortran_debug
@@ -33,8 +33,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.ifort b/lapack-netlib/INSTALL/make.inc.ifort
index a3c3742..b067bd4 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.ifort
+++ b/lapack-netlib/INSTALL/make.inc.ifort
@@ -29,8 +29,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.pgf95 b/lapack-netlib/INSTALL/make.inc.pgf95
index 931ff37..a9a5cec 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.pgf95
+++ b/lapack-netlib/INSTALL/make.inc.pgf95
@@ -29,8 +29,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/INSTALL/make.inc.pghpf b/lapack-netlib/INSTALL/make.inc.pghpf
index 0dfe8c6..1d9bf54 100644 (file)
--- a/lapack-netlib/INSTALL/make.inc.pghpf
+++ b/lapack-netlib/INSTALL/make.inc.pghpf
@@ -29,8 +29,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = echo
 
 #  Timer for the SECOND and DSECND routines

diff --git a/lapack-netlib/LAPACKE/src/Makefile b/lapack-netlib/LAPACKE/src/Makefile
index 03c140b..44884d4 100644 (file)
--- a/lapack-netlib/LAPACKE/src/Makefile
+++ b/lapack-netlib/LAPACKE/src/Makefile
@@ -2455,16 +2455,16 @@ endif
 all: ../../$(LAPACKELIB)
 
 ../../$(LAPACKELIB): $(OBJ_A) $(OBJ_B) $(DEPRECATED) $(EXTENDED) $(MATGEN)
-       $(AR) $(ARFLAGS) $@ $(OBJ_A)
-       $(AR) $(ARFLAGS) $@ $(OBJ_B)
+       $(ARCH) $(ARCHFLAGS) $@ $(OBJ_A)
+       $(ARCH) $(ARCHFLAGS) $@ $(OBJ_B)
 ifdef BUILD_DEPRECATED
-       $(AR) $(ARFLAGS) $@ $(DEPRECATED)
+       $(ARCH) $(ARCHFLAGS) $@ $(DEPRECATED)
 endif
 ifdef (USEXBLAS)
-       $(AR) $(ARFLAGS) $@ $(EXTENDED)
+       $(ARCH) $(ARCHFLAGS) $@ $(EXTENDED)
 endif
 ifdef LAPACKE_WITH_TMG
-       $(AR) $(ARFLAGS) $@ $(MATGEN)
+       $(ARCH) $(ARCHFLAGS) $@ $(MATGEN)
 endif
        $(RANLIB) $@
 

diff --git a/lapack-netlib/LAPACKE/utils/Makefile b/lapack-netlib/LAPACKE/utils/Makefile
index c6204ee..1f639c6 100644 (file)
--- a/lapack-netlib/LAPACKE/utils/Makefile
+++ b/lapack-netlib/LAPACKE/utils/Makefile
@@ -186,7 +186,7 @@ OBJ = lapacke_cgb_nancheck.o \
 all: lib
 
 lib: $(OBJ)
-       $(AR) $(ARFLAGS) ../../$(LAPACKELIB) $^
+       $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $^
        $(RANLIB) ../../$(LAPACKELIB)
 
 clean: cleanobj

diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile
index e5bb7a3..531cb51 100644 (file)
--- a/lapack-netlib/SRC/Makefile
+++ b/lapack-netlib/SRC/Makefile
@@ -553,26 +553,26 @@ endif
 all: ../$(LAPACKLIB)
 
 ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
-       $(AR) $(ARFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
+       $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
        $(RANLIB) $@
 
 single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
-       $(AR) $(ARFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
+       $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
        $(SXLASRC) $(SCLAUX) $(ALLAUX)
        $(RANLIB) ../$(LAPACKLIB)
 
 complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
-       $(AR) $(ARFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
+       $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
        $(CXLASRC) $(SCLAUX) $(ALLAUX)
        $(RANLIB) ../$(LAPACKLIB)
 
 double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
-       $(AR) $(ARFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
+       $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
        $(DXLASRC) $(DZLAUX) $(ALLAUX)
        $(RANLIB) ../$(LAPACKLIB)
 
 complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
-       $(AR) $(ARFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
+       $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
        $(ZXLASRC) $(DZLAUX) $(ALLAUX)
        $(RANLIB) ../$(LAPACKLIB)
 

diff --git a/lapack-netlib/SRC/VARIANTS/Makefile b/lapack-netlib/SRC/VARIANTS/Makefile
index 7d0e882..9f14107 100644 (file)
--- a/lapack-netlib/SRC/VARIANTS/Makefile
+++ b/lapack-netlib/SRC/VARIANTS/Makefile
@@ -33,27 +33,27 @@ QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
 all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a
 
 cholrl.a: $(CHOLRL)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 choltop.a: $(CHOLTOP)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 lucr.a: $(LUCR)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 lull.a: $(LULL)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 lurec.a: $(LUREC)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 qrll.a: $(QRLL)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 clean: cleanobj cleanlib

diff --git a/lapack-netlib/TESTING/MATGEN/Makefile b/lapack-netlib/TESTING/MATGEN/Makefile
index f5ea5a8..e20004c 100644 (file)
--- a/lapack-netlib/TESTING/MATGEN/Makefile
+++ b/lapack-netlib/TESTING/MATGEN/Makefile
@@ -58,23 +58,23 @@ ALLOBJ = $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) $(ZMATGEN) \
        $(DZATGEN)
 
 ../../$(TMGLIB): $(ALLOBJ)
-       $(AR) $(ARFLAGS) $@ $^
+       $(ARCH) $(ARCHFLAGS) $@ $^
        $(RANLIB) $@
 
 single: $(SMATGEN) $(SCATGEN)
-       $(AR) $(ARFLAGS) ../../$(TMGLIB) $^
+       $(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
        $(RANLIB) ../../$(TMGLIB)
 
 complex: $(CMATGEN) $(SCATGEN)
-       $(AR) $(ARFLAGS) ../../$(TMGLIB) $^
+       $(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
        $(RANLIB) ../../$(TMGLIB)
 
 double: $(DMATGEN) $(DZATGEN)
-       $(AR) $(ARFLAGS) ../../$(TMGLIB) $^
+       $(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
        $(RANLIB) ../../$(TMGLIB)
 
 complex16: $(ZMATGEN) $(DZATGEN)
-       $(AR) $(ARFLAGS) ../../$(TMGLIB) $^
+       $(ARCH) $(ARCHFLAGS) ../../$(TMGLIB) $^
        $(RANLIB) ../../$(TMGLIB)
 
 $(SCATGEN): $(FRC)

diff --git a/lapack-netlib/make.inc.example b/lapack-netlib/make.inc.example
index 3ddb9ea..d780c3a 100644 (file)
--- a/lapack-netlib/make.inc.example
+++ b/lapack-netlib/make.inc.example
@@ -33,8 +33,8 @@ LOADOPTS =
 #  The archiver and the flag(s) to use when building an archive
 #  (library).  If your system has no ranlib, set RANLIB = echo.
 #
-AR        = ar
-ARFLAGS   = cr
+ARCH      = ar
+ARCHFLAGS = cr
 RANLIB    = ranlib
 
 #  Timer for the SECOND and DSECND routines

diff --git a/make.inc b/make.inc
index 93b3551..b6ed098 100644 (file)
--- a/make.inc
+++ b/make.inc
@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 PLAT = _LINUX
 DRVOPTS  = $(NOOPT)
-#ARFLAGS= $(ARFLAGS) -ru
+#ARCHFLAGS= $(ARFLAGS) -ru
 #RANLIB   = ranlib