Browse Source
Merge pull request #2292 from martin-frbg/g95fixes
Improve support for g95 and non-GNU ldtags/v0.3.8^2
Martin Kroeker
GitHub
6 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Unified View
Diff Options
-
+3 -0Makefile.system
-
+7 -0f_check
+ 3
- 0
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
- 0
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; | ||||