diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-02 19:54:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-02 20:01:01 (GMT) |
| commit | bf5a5bc8b4788a236a53037c2f8a03904edf6079 (patch) | |
| tree | 626a957f79567013dd51d8688c03646e4d1913ca /bootstrap | |
| parent | 95f78e08febc541ec9f1d1b57e57c1c639c2d50a (diff) | |
| download | CMake-bf5a5bc8b4788a236a53037c2f8a03904edf6079.zip CMake-bf5a5bc8b4788a236a53037c2f8a03904edf6079.tar.gz CMake-bf5a5bc8b4788a236a53037c2f8a03904edf6079.tar.bz2 | |
bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324)
Revert commit a1c032b9 (bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS
have -isysroot, 2012-09-21). If MACOSX_DEPLOYMENT_TARGET is set then
CMAKE_OSX_DEPLOYMENT_TARGET will be set and Darwin.cmake will complain
if no CMAKE_OSX_SYSROOT is set. Just allow both -isysroot flags to
appear. The one generated by CMAKE_OSX_SYSROOT appears after and
overrides the one from CFLAGS/CXXFLAGS.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -1525,14 +1525,6 @@ 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 ' |