summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-03-26 12:00:34 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-03-26 12:01:00 (GMT)
commit0e323aad431044ccf60d72cb951563f78c688b66 (patch)
treef48838b77c2e0d60a72eb6a418d47c2a9f12fd83
parentee78f4e1daf72735d608e22f0c99c5e28a640601 (diff)
parent850cfe3a3b58db3bf76e5d5d6a2583f3849ab3e8 (diff)
downloadCMake-0e323aad431044ccf60d72cb951563f78c688b66.zip
CMake-0e323aad431044ccf60d72cb951563f78c688b66.tar.gz
CMake-0e323aad431044ccf60d72cb951563f78c688b66.tar.bz2
Merge topic 'bootstrap-var-options'
850cfe3a3b bootstrap: Add support for VAR=value options to specify tools and flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1859
-rwxr-xr-xbootstrap8
1 files changed, 8 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index d152c34..3d5b0d0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -821,6 +821,11 @@ while test $# != 0; do
--version) cmake_version_display ; exit 2 ;;
--verbose) cmake_verbose=TRUE ;;
--enable-ccache) cmake_ccache_enabled=TRUE ;;
+ CC=*) CC=`cmake_arg "$1"` ;;
+ CXX=*) CXX=`cmake_arg "$1"` ;;
+ CFLAGS=*) CFLAGS=`cmake_arg "$1"` ;;
+ CXXFLAGS=*) CXXFLAGS=`cmake_arg "$1"` ;;
+ LDFLAGS=*) LDFLAGS=`cmake_arg "$1"` ;;
--) shift; break ;;
*) die "Unknown option: $1" ;;
esac
@@ -1535,6 +1540,9 @@ MAKE="${cmake_make_processor}"
export CC
export CXX
export MAKE
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
# Run bootstrap CMake to configure real CMake
cmake_options="-DCMAKE_BOOTSTRAP=1"