@@ -92,8 +92,6 @@ if [[ ! -x "$build_script" ]]; then
92
92
echo " $this_script : $build_script script does not exist or the user lacks executable permission for it."
93
93
echo " $this_script : Please run this_script in the top-level OpenCoarrays source directory or set the"
94
94
echo " $this_script : OPENCOARRAYS_SRC_DIR environment variable to the top-level OpenCoarrays source path."
95
- echo " $this_script : If you have specified an installation directory that requires administrative privileges,"
96
- echo " $this_script : please prepend 'sudo' or 'sudo -E' to your invocation of the script [exit 20]."
97
95
exit 20
98
96
fi
99
97
@@ -687,11 +685,6 @@ find_or_install()
687
685
export MPICC=" $package_install_path /bin/mpicc"
688
686
echo " $this_script : export MPICXX=$package_install_path /bin/mpicxx"
689
687
export MPICXX=" $package_install_path /bin/mpicxx"
690
- # if [[ -z "$LD_LIBRARY_PATH" ]]; then
691
- # export LD_LIBRARY_PATH="$package_install_path/lib/"
692
- # else
693
- # export LD_LIBRARY_PATH="$package_install_path/lib/:$LD_LIBRARY_PATH"
694
- # fi
695
688
else
696
689
printf " $this_script : WARNING: $package executable $executable installed correctly but the \n"
697
690
printf " $this_script : corresponding environment variable(s) have not been set. This \n"
@@ -814,9 +807,9 @@ report_results()
814
807
gcc_install_path=` ./build gcc --default --query-path`
815
808
if [[ -d " $gcc_install_path /lib" ]]; then
816
809
echo " if [[ -z \"\$ LD_LIBRARY_PATH\" ]]; then " >> setup.sh
817
- echo " export LD_LIBRARY_PATH=\" $gcc_install_path /lib \" " >> setup.sh
810
+ echo " export LD_LIBRARY_PATH=\" $gcc_install_path /lib64 \" " >> setup.sh
818
811
echo " else " >> setup.sh
819
- echo " export LD_LIBRARY_PATH=\" $gcc_install_path /lib \" :\$ LD_LIBRARY_PATH " >> setup.sh
812
+ echo " export LD_LIBRARY_PATH=\" $gcc_install_path /lib64 \" :\$ LD_LIBRARY_PATH " >> setup.sh
820
813
echo " fi " >> setup.sh
821
814
fi
822
815
echo " " >> setup.sh
0 commit comments