summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorOrgad Shaneh <orgads@gmail.com>2021-04-01 17:03:52 (GMT)
committerBrad King <brad.king@kitware.com>2021-04-26 18:27:34 (GMT)
commitddcd1469e8377fe258913a20aa47e65f71f8695b (patch)
treed18b6561383a8f4bc206dac848a15814b74ca642 /bootstrap
parentb3ca4f9ad18220b2f56cd6af7df5cf1e671d39a8 (diff)
downloadCMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.zip
CMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.tar.gz
CMake-ddcd1469e8377fe258913a20aa47e65f71f8695b.tar.bz2
MSYS: Add support for running under MSYS runtime environment
Detect MSYS as CYGWIN, with the required adaptations.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap14
1 files changed, 12 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index 2a81ef2..aefd210 100755
--- a/bootstrap
+++ b/bootstrap
@@ -97,8 +97,17 @@ else
cmake_system_cygwin=false
fi
+# Determine whether this is a MSYS environment.
+if echo "${cmake_system}" | grep MSYS >/dev/null 2>&1; then
+ cmake_system_msys=true
+ cmake_doc_dir_keyword="MSYS"
+ cmake_man_dir_keyword="MSYS"
+else
+ cmake_system_msys=false
+fi
+
# Determine whether this is a MinGW environment.
-if echo "${cmake_system}" | grep 'MINGW\|MSYS' >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep 'MINGW' >/dev/null 2>&1; then
cmake_system_mingw=true
else
cmake_system_mingw=false
@@ -1071,7 +1080,7 @@ else
fi
# Add Cygwin-specific flags
-if ${cmake_system_cygwin}; then
+if ${cmake_system_cygwin} || ${cmake_system_msys}; then
cmake_ld_flags="${LDFLAGS} -Wl,--enable-auto-import"
fi
@@ -1096,6 +1105,7 @@ cmake_toolchains=''
case "${cmake_system}" in
*AIX*) cmake_toolchains='XL GNU' ;;
*CYGWIN*) cmake_toolchains='GNU' ;;
+ *MSYS*) cmake_toolchains='GNU' ;;
*Darwin*) cmake_toolchains='Clang GNU' ;;
*Linux*) cmake_toolchains='GNU Clang XL PGI PathScale' ;;
*MINGW*) cmake_toolchains='GNU' ;;