Changeset 2388


Ignore:
Timestamp:
Sep 4, 2017 12:49:36 PM (4 years ago)
Author:
raasch
Message:

string loader replaced by linker

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmbuild

    r2384 r2388  
    424424       line=$(echo "$line" | cut -c51-)
    425425    done
    426     column2=$(echo "$loader_options" | cut -c1-50 )
    427     printf "| %-20s%-50s | \n" "loader options:" "$column2"
    428     line=$(echo "$loader_options" | cut -c51-)
     426    column2=$(echo "$linker_options" | cut -c1-50 )
     427    printf "| %-20s%-50s | \n" "linker options:" "$column2"
     428    line=$(echo "$linker_options" | cut -c51-)
    429429    while [[ "$line" != "" ]]
    430430    do
     
    521521          echo " "
    522522          echo "  *** creating utilities on remote host"
    523           make_call_string="make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
     523          make_call_string="make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$linker_options\" "
    524524          echo "$login_init_cmd $module_commands cd ${remote_make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${remote_hostname}_last_make_protokoll
    525525
     
    555555          echo " "
    556556          echo "  *** compile PALM sources on remote host"
    557           make_call_string="make  $make_options  PROG=$program_name  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
     557          make_call_string="make  $make_options  PROG=$program_name  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$linker_options\" "
    558558          echo "$login_init_cmd $module_commands cd ${remote_make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${remote_hostname}_last_make_protokoll
    559559
     
    610610          then
    611611
    612              make_call_string="make  $make_options  PROG=$program_name  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
     612             make_call_string="make  $make_options  PROG=$program_name  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$linker_options\" "
    613613             [[ "$login_init_cmd" != "" ]]   &&  login_init_cmd=${login_init_cmd}";"
    614614             [[ "$module_commands" != "" ]]  &&  module_commands=${module_commands}";"
     
    700700          echo " "
    701701          echo "  *** creating utilities on local host"
    702           make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"
     702          make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
    703703
    704704
     
    707707          echo "  *** compile PALM sources on local host"
    708708
    709           make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"  2>&1 | tee ${local_hostname}_last_make_protokoll
     709          make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"  2>&1 | tee ${local_hostname}_last_make_protokoll
    710710
    711711          if [[ $? != 0 ]]
     
    778778             [[ "$module_commands" != "" ]]  &&  $module_commands
    779779
    780              make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"
     780             make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
    781781
    782782             if [[ \$? != 0 ]]
  • palm/trunk/SCRIPTS/palmrun

    r2385 r2388  
    8383 link_local_input=false
    8484 link_local_output=false
    85  loader_options=""
     85 linker_options=""
    8686 local_jobcatalog=""
    8787 locat=normal
     
    416416    locat=config_file; exit
    417417 fi
    418  if [[ "$loader_options" = "" ]]
    419  then
    420     printf "\n  +++ no loader options found in $config_file"
    421     printf "\n      Please add line \"loader_options ...\" to that file."
     418 if [[ "$linker_options" = "" ]]
     419 then
     420    printf "\n  +++ no linker options found in $config_file"
     421    printf "\n      Please add line \"linker_options ...\" to that file."
    422422    locat=config_file; exit
    423423 fi
     
    13551355 done
    13561356
    1357  column1="loader options:"; column2=$(echo "$loader_options" | cut -c-45)
     1357 column1="linker options:"; column2=$(echo "$linker_options" | cut -c-45)
    13581358 printf "| %-25s%-45s | \n" "$column1" "$column2"
    1359  line=$(echo "$loader_options" | cut -c46-)
     1359 line=$(echo "$linker_options" | cut -c46-)
    13601360 while [[ "$line" != "" ]]
    13611361 do
Note: See TracChangeset for help on using the changeset viewer.