Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quote bootstrap variables to avoid word splitting #1644

Merged
merged 1 commit into from
May 13, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ source_dir=`cd "\`dirname \"$0\"\`";pwd`
binary_dir=`pwd`

# Choose the default install prefix.
default_prefix=${source_dir}/dist
default_prefix="${source_dir}/dist"

# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
Expand All @@ -34,7 +34,7 @@ Configuration:
--help print this message
--prefix=PREFIX install files in tree rooted at PREFIX
['"${default_prefix}"']
--dependency=DIRs specify the dependencies at DIRs, separated by colon
--dependency=DIRs specify the dependencies at DIRs, separated by colon
['"${default_dependency}"']
--force-build-all-deps force building of all dependencies, even those
already installed at system-level
Expand All @@ -59,7 +59,7 @@ Configuration:
--enable-ccache enables use of ccache (if present)
--enable=arg1,arg2... same as "--enable-arg1 --enable-arg2 ..."


Dependencies:
c/c++ compiler
GNU make
Expand All @@ -70,7 +70,7 @@ Example:
cd build
../bootstrap --prefix=/path/to/install --dependency=/path/to/dep1:path/to/dep2...
make
make install
make install
'
exit 10
}
Expand Down Expand Up @@ -150,7 +150,7 @@ for en in "${enables[@]}"; do
esac
done

if [ ${source_dir} = ${binary_dir} ]; then
if [ "${source_dir}" = "${binary_dir}" ]; then
die "cannot build the project in the source directory! Out-of-source build is enforced!"
fi

Expand Down Expand Up @@ -181,10 +181,10 @@ fi

# Configure
${cmake} -DCMAKE_BUILD_TYPE=${build_type} \
-DCMAKE_INSTALL_PREFIX=${prefix_dirs} \
-DCMAKE_C_COMPILER=${c_compiler} \
-DCMAKE_CXX_COMPILER=${cxx_compiler} \
-DCMAKE_PREFIX_PATH=${dependency_dir} \
-DCMAKE_INSTALL_PREFIX="${prefix_dirs}" \
-DCMAKE_C_COMPILER="${c_compiler}" \
-DCMAKE_CXX_COMPILER="${cxx_compiler}" \
-DCMAKE_PREFIX_PATH="${dependency_dir}" \
-DTILEDB_VERBOSE=${tiledb_verbose} \
-DTILEDB_HDFS=${tiledb_hdfs} \
-DTILEDB_S3=${tiledb_s3} \
Expand All @@ -200,8 +200,8 @@ ${cmake} -DCMAKE_BUILD_TYPE=${build_type} \
-DTILEDB_TESTS=${tiledb_tests} \
-DTILEDB_CCACHE=${tiledb_ccache} \
-DTILEDB_FORCE_ALL_DEPS=${tiledb_force_all_deps} \
-DSANITIZER=${sanitizer} \
-DSANITIZER="${sanitizer}" \
${tiledb_disable_avx2} \
${source_dir} || die "failed to configure the project"
"${source_dir}" || die "failed to configure the project"

echo 'bootstrap success. Run "make" to build, "make check" to test, or "make -C tiledb install" to install.'