Changeset 4081 for palm/trunk/SCRIPTS/palmbuild

Timestamp:

Jul 10, 2019 2:34:11 PM (5 years ago)

Author:

raasch

Message:

bugfix for executing module commands and for interpreting linker options on local machines

File:

• palm/trunk/SCRIPTS/palmbuild (modified) (4 diffs)

palm/trunk/SCRIPTS/palmbuild

@@ -27 +27 @@
 # -----------------
 # $Id$
+# bugfix for executing module commands and for interpreting linker options
+# on local machines
+# 
+# 3756 2019-02-20 11:24:32Z suehring
 # Disable compilation of postprocessing tool for surface output, until  
 # crashes with unexpected segmentation faults with intel compiler are solved. 
@@ -754 +758 @@
        if [[ "$login_init_cmd" != "" ]]
        then
-          $login_init_cmd
+          eval $login_init_cmd
        fi
 
        if [[ "$module_commands" != "" ]]
        then
-          $module_commands
-       fi
-
+          eval $module_commands
+       fi
+
+          # next is required to evaluate environment variables or commands used in the linker option
+       eval linker_options=\"$linker_options\"
 
           # CREATE MAKE-DEPOSITORY, IF IT DOES NOT EXIST
@@ -840 +846 @@
        fi
 
+       linker_options=\"eval $linker_options\"
+
        make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"  2>&1 | tee ${configuration_identifier}_last_make_protocol
 
@@ -933 +941 @@
              echo "  *** execute \"make\" on local host"
           fi
-          [[ "$login_init_cmd" != "" ]]   &&  $login_init_cmd
-          [[ "$module_commands" != "" ]]  &&  $module_commands
+          [[ "$login_init_cmd" != "" ]]   &&  eval $login_init_cmd
+          [[ "$module_commands" != "" ]]  &&  eval $module_commands
+
+             # next is required to evaluate environment variables or commands used in the linker option
+          eval linker_options=\"$linker_options\"
 
           make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"