Browse Source

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
tags/v0.3.8^2
Martin Kroeker GitHub 6 years ago
parent
commit
911c3e2f4b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
  1. +3
    -0
      Makefile.system
  2. +7
    -0
      f_check

+ 3
- 0
Makefile.system View File

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



+ 7
- 0
f_check View File

@@ -130,6 +130,11 @@ if ($compiler eq "") {
if ($data =~ / zho_ge__/) {
$need2bu = 1;
}
if ($vendor =~ /G95/) {
if ($ENV{NO_LAPACKE} != 1) {
$need2bu = "";
}
}
}

if ($vendor eq "") {
@@ -277,6 +282,8 @@ $linker_a = "";
if ($link ne "") {

$link =~ s/\-Y\sP\,/\-Y/g;
$link =~ s/\-R+/\-rpath\@/g;

$link =~ s/\-rpath\s+/\-rpath\@/g;



Loading…
Cancel
Save