diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2013-08-20 13:00:09 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-08-21 08:36:18 -0700 |
| commit | 18857444d2a3ee6800e9ba96c9669e279065fa5d (patch) | |
| tree | 86a4f722e068ad102d827c19efc1acb5931c108f | |
| parent | 911b4676559d6325e798ba07a5a83d7083cf11da (diff) | |
cmake: Fix test for thread-local storage
Commit 6fcbe52 "cmake: Refactor compiler flags into new module" exposed a bug
in the test for thread-local storage, causing the test to always fail. If the
regex "warning|error" appears in the compiler log, then the test fails. This
causes false failures when the test invokes the compiler with
'-Werror=missing-prototypes'.
Fix the regex to more closely match gcc and clang error messages.
Reported-by: Paul Berry <stereotype441@gmail.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
| -rw-r--r-- | cmake/Modules/WaffleCheckThreadLocalStorage.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/WaffleCheckThreadLocalStorage.cmake b/cmake/Modules/WaffleCheckThreadLocalStorage.cmake index c8bc3fe..f988f6f 100644 --- a/cmake/Modules/WaffleCheckThreadLocalStorage.cmake +++ b/cmake/Modules/WaffleCheckThreadLocalStorage.cmake @@ -61,7 +61,7 @@ macro(waffle_check_thread_local_storage) waffle_has_tls - FAIL_REGEX "warning|error" + FAIL_REGEX "warning: |error: " ) check_c_source_compiles( @@ -77,6 +77,6 @@ macro(waffle_check_thread_local_storage) waffle_has_tls_model_initial_exec - FAIL_REGEX "warning|error" + FAIL_REGEX "warning: |error: " ) endmacro() |