diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2017-07-27 20:44:33 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2017-07-27 20:44:33 +0000 |
| commit | 3d7f9b6425d5fed1fd084e5317ad5982201bf85d (patch) | |
| tree | 65fa1cde106277e6181a5855c412327781afd08b /cmake/Modules | |
| parent | fa4969a72758e98246cb7ee4e8178bca5dd5250a (diff) | |
Revert "[sanitizers] Sanitizer tests CMake clean up"
This reverts commit 0ab44db2aa1cd3710355ad79b04f954ce68c0b3a.
Fails on some bots, reverting until I can fix it.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309318 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 2366195ab..bc5fb9ff7 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -301,7 +301,10 @@ macro(add_compiler_rt_test test_suite test_name) if(TEST_SUBDIR) set(output_bin "${output_bin}/${TEST_SUBDIR}") endif() - set(output_bin "${output_bin}/${CMAKE_CFG_INTDIR}/${test_name}") + if(CMAKE_CONFIGURATION_TYPES) + set(output_bin "${output_bin}/${CMAKE_CFG_INTDIR}") + endif() + set(output_bin "${output_bin}/${test_name}") if(MSVC) set(output_bin "${output_bin}.exe") endif() |