1 files changed, 9 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 9b6d634..713f01f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -204,6 +204,7 @@ CMAKE_CXX_SOURCES="\
   cmInstallDirectoryGenerator \
   cmGeneratedFileStream \
   cmGeneratorTarget \
+  cmGeneratorExpressionDAGChecker \
   cmGeneratorExpressionEvaluator \
   cmGeneratorExpressionLexer \
   cmGeneratorExpressionParser \
@@ -1507,6 +1508,14 @@ set (CMAKE_MAN_DIR "'"${cmake_man_dir}"'" CACHE PATH "Install location for man p
 set (CMAKE_DATA_DIR "'"${cmake_data_dir}"'" CACHE PATH "Install location for data (relative to prefix)." FORCE)
 ' > "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
 
+# Suppress -isysroot if user-provided flags already have it.
+if echo "${cmake_c_flags}"   | grep isysroot >/dev/null 2>&1 &&
+   echo "${cmake_cxx_flags}" | grep isysroot >/dev/null 2>&1; then
+  echo '
+set(CMAKE_OSX_SYSROOT "" CACHE PATH "" FORCE)
+' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
+fi
+
 # Add configuration settings given as command-line options.
 if [ "x${cmake_bootstrap_qt_gui}" != "x" ]; then
   echo '