Skip to content

Commit 6334961

Browse files
author
rouson
committed
install.sh now writes setup.sh w/64-bit LD_LIBRARY
1 parent 307fdf9 commit 6334961

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

install.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ if [[ ! -x "$build_script" ]]; then
9292
echo "$this_script: $build_script script does not exist or the user lacks executable permission for it."
9393
echo "$this_script: Please run this_script in the top-level OpenCoarrays source directory or set the"
9494
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]."
9795
exit 20
9896
fi
9997

@@ -687,11 +685,6 @@ find_or_install()
687685
export MPICC="$package_install_path/bin/mpicc"
688686
echo "$this_script: export MPICXX=$package_install_path/bin/mpicxx"
689687
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
695688
else
696689
printf "$this_script: WARNING: $package executable $executable installed correctly but the \n"
697690
printf "$this_script: corresponding environment variable(s) have not been set. This \n"
@@ -814,9 +807,9 @@ report_results()
814807
gcc_install_path=`./build gcc --default --query-path`
815808
if [[ -d "$gcc_install_path/lib" ]]; then
816809
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
818811
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
820813
echo "fi " >> setup.sh
821814
fi
822815
echo " " >> setup.sh

0 commit comments

Comments
 (0)