File tree Expand file tree Collapse file tree 4 files changed +11
-8
lines changed Expand file tree Collapse file tree 4 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -188,8 +188,8 @@ info "-V (--print-version): ${arg_V}"
188
188
this_script=" $( basename " $0 " ) "
189
189
export this_script
190
190
191
- export install_path=" ${arg_i} / ${arg_p} "
192
- info " install_path=${arg_i} / ${arg_p} "
191
+ export install_path=" ${arg_i} "
192
+ info " install_path=${arg_i} "
193
193
194
194
export num_threads=" ${arg_j} "
195
195
info " num_threads=${arg_j} "
Original file line number Diff line number Diff line change 1
1
# shellcheck source=./ftp-url.sh
2
- source " ${opencoarrays_src_dir } /prerequisites/build-functions/ftp-url.sh"
2
+ source " ${OPENCOARRAYS_SRC_DIR } /prerequisites/build-functions/ftp-url.sh"
3
3
# shellcheck source=./set_SUDO_if_needed_to_write_to_directory.sh
4
- source " ${opencoarrays_src_dir } /prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
4
+ source " ${OPENCOARRAYS_SRC_DIR } /prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
5
5
6
6
# Download pkg-config if the tar ball is not already in the present working directory
7
7
# shellcheck disable=SC2154
8
8
download_if_necessary ()
9
9
{
10
- download_path=" ${opencoarrays_src_dir } /prerequisites/downloads"
10
+ download_path=" ${OPENCOARRAYS_SRC_DIR } /prerequisites/downloads"
11
11
set_SUDO_if_needed_to_write_to_directory " ${download_path} "
12
12
if [[ -f " ${download_path} /${url_tail} " || -d " ${download_path} /${url_tail} " ]] ; then
13
13
info " Found '${url_tail} ' in ${download_path} ."
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ set_SUDO_if_needed_to_write_to_directory()
9
9
if [[ -z " ${LD_LIBRARY_PATH:- } " ]]; then
10
10
info " \$ {LD_LIBRARY_PATH} is empty. Try setting it if the compiler encounters linking problems."
11
11
fi
12
- SUDO_COMMAND=" sudo env LD_LIBRARY_PATH=${LD_LIBRARY_PATH:- " " } "
12
+ SUDO_COMMAND=" sudo env LD_LIBRARY_PATH=${LD_LIBRARY_PATH:- } PATH= ${PATH :- }"
13
13
info " Checking whether the directory ${directory_to_create} exists... "
14
14
if [[ -d " ${directory_to_create} " ]]; then
15
15
info " yes"
Original file line number Diff line number Diff line change @@ -134,15 +134,18 @@ find_or_install()
134
134
stack_push dependency_path " none" " $( ./build.sh -P " $package " ) " " $( ./build.sh -P gcc) "
135
135
else
136
136
printf " yes.\n"
137
+
137
138
echo -e " $this_script : Checking whether $executable in PATH wraps gfortran version ` ./build.sh -V gcc` or later... "
138
139
$executable acceptable_compiler.f90 -o acceptable_compiler
139
140
$executable print_true.f90 -o print_true
140
141
acceptable=$( ./acceptable_compiler)
141
142
is_true=$( ./print_true)
142
143
rm acceptable_compiler print_true
144
+
145
+ [ " $acceptable " == " $is_true " ] && printf " yes.\n"
146
+ [ ! -z " ${arg_f} " ] && printf " no.\n Default compiler installation overridden by --with-fortran/-f=${arg_f} \n"
143
147
144
- if [[ " $acceptable " == " $is_true " ]]; then
145
- printf " yes.\n"
148
+ if [[ " $acceptable " == " $is_true " || ! -z " ${arg_f} " ]]; then
146
149
echo -e " $this_script : Using the $executable found in the PATH.\n"
147
150
export MPIFC=mpif90
148
151
export MPICC=mpicc
You can’t perform that action at this time.
0 commit comments