floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve support for g95 and non-GNU ld 

Auto-add "-fno-second-underscore" option to make LAPACKE compile (as it calls LAPACK functions that may have gotten a second underscore added otherwise). Also support -R for rpath when parsing compiler directives in f_check
This commit is contained in:
Martin Kroeker 2019-10-24 22:43:27 +02:00 committed by GitHub
parent 3a39062cfc
commit 911c3e2f4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.system
View File

@ -769,6 +769,9 @@ else
FCOMMON_OPT += -m32 FCOMMON_OPT += -m32
endif endif
endif endif
ifneq ($(NO_LAPACKE), 1)
FCOMMON_OPT += -fno-second-underscore
endif
endif endif
endif endif

7
f_check
View File

@ -130,6 +130,11 @@ if ($compiler eq "") {
if ($data =~ / zho_ge__/) { if ($data =~ / zho_ge__/) {
$need2bu = 1; $need2bu = 1;
} }
if ($vendor =~ /G95/) {
if ($ENV{NO_LAPACKE} != 1) {
$need2bu = "";
}
}
} }
if ($vendor eq "") { if ($vendor eq "") {
@ -277,6 +282,8 @@ $linker_a = "";
if ($link ne "") { if ($link ne "") {
$link =~ s/\-Y\sP\,/\-Y/g; $link =~ s/\-Y\sP\,/\-Y/g;
$link =~ s/\-R+/\-rpath\@/g;
$link =~ s/\-rpath\s+/\-rpath\@/g; $link =~ s/\-rpath\s+/\-rpath\@/g;