From 911c3e2f4b4d557e8b65624beb90d5138289a4f3 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 24 Oct 2019 22:43:27 +0200
Subject: [PATCH] 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
---
 Makefile.system | 3 +++
 f_check         | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/Makefile.system b/Makefile.system
index 8843d0ad3..4cb4dc954 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -769,6 +769,9 @@ else
 FCOMMON_OPT += -m32
 endif
 endif
+ifneq ($(NO_LAPACKE), 1)
+FCOMMON_OPT += -fno-second-underscore
+endif
 endif
 endif
 
diff --git a/f_check b/f_check
index b05db85bd..0afbab23a 100644
--- a/f_check
+++ b/f_check
@@ -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;