Changeset 2388 for palm/trunk/SCRIPTS
- Timestamp:
- Sep 4, 2017 12:49:36 PM (7 years ago)
- Location:
- palm/trunk/SCRIPTS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/palmbuild
r2384 r2388 424 424 line=$(echo "$line" | cut -c51-) 425 425 done 426 column2=$(echo "$l oader_options" | cut -c1-50 )427 printf "| %-20s%-50s | \n" "l oader options:" "$column2"428 line=$(echo "$l oader_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-) 429 429 while [[ "$line" != "" ]] 430 430 do … … 521 521 echo " " 522 522 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=\"$l oader_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\" " 524 524 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 525 525 … … 555 555 echo " " 556 556 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=\"$l oader_options\" "557 make_call_string="make $make_options PROG=$program_name F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$compiler_options\" LDFLAGS=\"$linker_options\" " 558 558 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 559 559 … … 610 610 then 611 611 612 make_call_string="make $make_options PROG=$program_name F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$compiler_options\" LDFLAGS=\"$l oader_options\" "612 make_call_string="make $make_options PROG=$program_name F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$compiler_options\" LDFLAGS=\"$linker_options\" " 613 613 [[ "$login_init_cmd" != "" ]] && login_init_cmd=${login_init_cmd}";" 614 614 [[ "$module_commands" != "" ]] && module_commands=${module_commands}";" … … 700 700 echo " " 701 701 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="$l oader_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" 703 703 704 704 … … 707 707 echo " *** compile PALM sources on local host" 708 708 709 make $make_options PROG=$program_name F90=$compiler_name COPT="$cpp_options" F90FLAGS="$compiler_options" LDFLAGS="$l oader_options" 2>&1 | tee ${local_hostname}_last_make_protokoll709 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 710 710 711 711 if [[ $? != 0 ]] … … 778 778 [[ "$module_commands" != "" ]] && $module_commands 779 779 780 make $make_options PROG=$program_name F90=$compiler_name COPT="$cpp_options" F90FLAGS="$compiler_options" LDFLAGS="$l oader_options"780 make $make_options PROG=$program_name F90=$compiler_name COPT="$cpp_options" F90FLAGS="$compiler_options" LDFLAGS="$linker_options" 781 781 782 782 if [[ \$? != 0 ]] -
palm/trunk/SCRIPTS/palmrun
r2385 r2388 83 83 link_local_input=false 84 84 link_local_output=false 85 l oader_options=""85 linker_options="" 86 86 local_jobcatalog="" 87 87 locat=normal … … 416 416 locat=config_file; exit 417 417 fi 418 if [[ "$l oader_options" = "" ]]419 then 420 printf "\n +++ no l oader options found in $config_file"421 printf "\n Please add line \"l oader_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." 422 422 locat=config_file; exit 423 423 fi … … 1355 1355 done 1356 1356 1357 column1="l oader options:"; column2=$(echo "$loader_options" | cut -c-45)1357 column1="linker options:"; column2=$(echo "$linker_options" | cut -c-45) 1358 1358 printf "| %-25s%-45s | \n" "$column1" "$column2" 1359 line=$(echo "$l oader_options" | cut -c46-)1359 line=$(echo "$linker_options" | cut -c46-) 1360 1360 while [[ "$line" != "" ]] 1361 1361 do
Note: See TracChangeset
for help on using the changeset viewer.