Skip to content

Commit 488f94d

Browse files
committed
Corrected assumed command-line argument positions in install_prerequisites/build that prevented building in a non-default location.
Signed-off-by: Damian Rouson <[email protected]>
1 parent a32a3e8 commit 488f94d

File tree

1 file changed

+4
-4
lines changed
  • install_prerequisites

1 file changed

+4
-4
lines changed

install_prerequisites/build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ default_install_path=${PWD}/$package_to_build-$version_to_build-installation
135135
if [[ -z $3 || $3 == "--query" ]]; then
136136
install_path=$default_install_path
137137
else
138-
install_path=$2
138+
install_path=$3
139139
fi
140140

141141
# Interpret the fourth command-line argument, if present, as the number of threads for 'make'.
142142
# Otherwise, default to single-threaded 'make'.
143143
if [ -z $4 ]; then
144144
num_threads=1
145145
else
146-
num_threads=$3
146+
num_threads=$4
147147
fi
148148

149149

@@ -328,8 +328,6 @@ unpack_if_necessary()
328328
# Make the build directory, configure, and build
329329
build_and_install()
330330
{
331-
#echo "Configuring with the following command: "
332-
#echo "$download_path/$package_source_directory/configure --prefix=$install_path"
333331

334332
build_path=${PWD}/$package_to_build-$version_to_build-build &&
335333
printf "Building $package_to_build $version_to_build.\n" &&
@@ -339,6 +337,8 @@ build_and_install()
339337
pushd $download_path/$package_source_directory &&
340338
${PWD}/contrib/download_prerequisites &&
341339
popd &&
340+
echo "Configuring with the following command: " &&
341+
echo "$download_path/$package_source_directory/configure --prefix=$install_path --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror " &&
342342
$download_path/$package_source_directory/configure --prefix=$install_path --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror &&
343343
make -j $num_threads bootstrap &&
344344
make install

0 commit comments

Comments
 (0)