Skip to content

Commit d93cf11

Browse files
authored
Merge pull request #1753 from dloghin/risc-v
Override ARCH (archiver) in lapack-netlib/make.inc to avoid conflict with ARCH (architecture)
2 parents cbc4616 + a1bdc30 commit d93cf11

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ ifndef NOFORTRAN
237237
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
238238
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
239239
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
240-
-@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
240+
-@echo "override ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
241241
-@echo "ARCHFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
242242
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
243243
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc

c_check

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ if (($architecture eq "x86") && ($os ne Darwin) && ($os ne SunOS)) {
121121
$binary =32;
122122
}
123123

124+
if ($architecture eq "riscv64") {
125+
$defined = 1;
126+
$binary = 64;
127+
}
128+
124129
if ($compiler eq "PGI") {
125130
$compiler_name .= " -tp p7" if ($binary eq "32");
126131
$compiler_name .= " -tp p7-64" if ($binary eq "64");

0 commit comments

Comments
 (0)