diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-19 14:07:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-19 14:07:57 (GMT) |
| commit | fab301bb9d6d7d1c92db077fcd4789c0eb03203f (patch) | |
| tree | 1b4be5824b8ddd830c97f1ce9bce564e444db009 | |
| parent | 85af079ab17c2f35dcfd2a5f434b8131e06d5b16 (diff) | |
| parent | 147ba659c1bbd290fbfcf6fedcdaf843ef03d950 (diff) | |
| download | CMake-fab301bb9d6d7d1c92db077fcd4789c0eb03203f.zip CMake-fab301bb9d6d7d1c92db077fcd4789c0eb03203f.tar.gz CMake-fab301bb9d6d7d1c92db077fcd4789c0eb03203f.tar.bz2 | |
Merge topic 'bootstrap-compiler-check-ldflags'
147ba659c1 bootstrap: add cmake_ld_flags to compilers check
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5711
| -rwxr-xr-x | bootstrap | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1195,8 +1195,8 @@ for std in 11 99 90; do for compiler in ${cmake_c_compilers}; do for std_flag in '' $std_flags; do for thread_flag in '' $thread_flags; do - echo "Checking whether '${compiler} ${cmake_c_flags} ${std_flag} ${thread_flag}' works." >> cmake_bootstrap.log 2>&1 - if cmake_try_run "${compiler}" "${cmake_c_flags} ${std_flag} ${thread_flag}" \ + echo "Checking whether '${compiler} ${cmake_c_flags} ${cmake_ld_flags} ${std_flag} ${thread_flag}' works." >> cmake_bootstrap.log 2>&1 + if cmake_try_run "${compiler}" "${cmake_c_flags} ${cmake_ld_flags} ${std_flag} ${thread_flag}" \ "${TMPFILE}.c" >> cmake_bootstrap.log 2>&1; then cmake_c_compiler="${compiler}" cmake_c_flags="${cmake_c_flags} ${std_flag} ${thread_flag}" @@ -1316,8 +1316,8 @@ for std in 17 14 11; do for compiler in ${cmake_cxx_compilers}; do for std_flag in '' $std_flags; do for thread_flag in '' $thread_flags; do - echo "Checking whether '${compiler} ${cmake_cxx_flags} ${std_flag} ${thread_flag}' works." >> cmake_bootstrap.log 2>&1 - if cmake_try_run "${compiler}" "${cmake_cxx_flags} ${std_flag} ${thread_flag}" \ + echo "Checking whether '${compiler} ${cmake_cxx_flags} ${cmake_ld_flags} ${std_flag} ${thread_flag}' works." >> cmake_bootstrap.log 2>&1 + if cmake_try_run "${compiler}" "${cmake_cxx_flags} ${cmake_ld_flags} ${std_flag} ${thread_flag}" \ "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then cmake_cxx_compiler="${compiler}" cmake_cxx_flags="${cmake_cxx_flags} ${std_flag} ${thread_flag} " @@ -1345,8 +1345,8 @@ cmake_cxx_features="make_unique filesystem" for feature in ${cmake_cxx_features}; do eval "cmake_have_cxx_${feature}=0" - echo "Checking whether '${cmake_cxx_compiler} ${cmake_cxx_flags}' supports '${feature}'." >> cmake_bootstrap.log 2>&1 - if cmake_try_run "${cmake_cxx_compiler}" "${cmake_cxx_flags}" \ + echo "Checking whether '${cmake_cxx_compiler} ${cmake_cxx_flags} ${cmake_ld_flags}' supports '${feature}'." >> cmake_bootstrap.log 2>&1 + if cmake_try_run "${cmake_cxx_compiler}" "${cmake_cxx_flags} ${cmake_ld_flags}" \ "${cmake_source_dir}/Source/Checks/cm_cxx_${feature}.cxx" >> cmake_bootstrap.log 2>&1; then eval "cmake_have_cxx_${feature}=1" fi |