From a8fc30f95a7ef705670f8603361bff34f09a1060 Mon Sep 17 00:00:00 2001 From: Themos Tsikas Date: Fri, 2 Mar 2018 12:54:12 +0000 Subject: [PATCH] configury: Make more robust in finding NAG Fortran Compiler The NAG Fortran check only matched "nagfor" exactly, and failed if a path to nagfor was provided. Also change "-pthread" into "-Wl,-pthread". Signed-off-by: Themos Tsikas Signed-off-by: Jeff Squyres --- config/ltmain_nag_pthread.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ltmain_nag_pthread.diff b/config/ltmain_nag_pthread.diff index 87c2781009..927b671f9a 100644 --- a/config/ltmain_nag_pthread.diff +++ b/config/ltmain_nag_pthread.diff @@ -8,7 +8,7 @@ if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + case "$CC" in -+ nagfor*) ++ *nagfor*) + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g' | $SED 's/-pthread/-Wl,-pthread/g'`;; + *) + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`;;