summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIssam Maghni <me@concati.me>2020-05-02 21:49:36 (GMT)
committerBrad King <brad.king@kitware.com>2020-05-05 16:42:40 (GMT)
commit3e874e883432e6c24afa3b18986825a1c9c44e5f (patch)
treee9775eda9be73d5b3f22acb20cd8d060515c8785
parent1c060602885b62d2ec5e6052bc113834adbaed29 (diff)
downloadCMake-3e874e883432e6c24afa3b18986825a1c9c44e5f.zip
CMake-3e874e883432e6c24afa3b18986825a1c9c44e5f.tar.gz
CMake-3e874e883432e6c24afa3b18986825a1c9c44e5f.tar.bz2
bootstrap: Prefer “test … && test …” over “test … -a …”
From https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
-rwxr-xr-xbootstrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap b/bootstrap
index b59aa68..d46d45d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -912,8 +912,8 @@ echo "`cmake_version_display`"
# Check for in-source build
cmake_in_source_build=
-if test -f "${cmake_binary_dir}/Source/cmake.cxx" -a \
- -f "${cmake_binary_dir}/Source/cmake.h"; then
+if test -f "${cmake_binary_dir}/Source/cmake.cxx" &&
+ test -f "${cmake_binary_dir}/Source/cmake.h"; then
if test -n "${cmake_verbose}"; then
echo "Warning: This is an in-source build"
fi
@@ -1044,7 +1044,7 @@ cmake_toolchain_detect()
done
}
-if test -z "${CC}" -a -z "${CXX}"; then
+if test -z "${CC}" && test -z "${CXX}"; then
cmake_toolchain_detect
fi