diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-03 17:12:36 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-03 17:12:36 +0000 |
| commit | d297dafa58f7c1f5ad826e1d8eaaf1e796602e7c (patch) | |
| tree | e365046bad9f2d2652fce5cfb5b72fdfad9cb15b | |
| parent | 0bdb983f1c6401c060a6756ebec71aa68eed87eb (diff) | |
| download | compiler-rt-d297dafa58f7c1f5ad826e1d8eaaf1e796602e7c.tar.gz | |
Merging r259577:
------------------------------------------------------------------------
r259577 | dsanders | 2016-02-02 21:41:17 +0000 (Tue, 02 Feb 2016) | 5 lines
[tsan] Disable x86_64h build that was enabled as part of r259542.
It fails almost every test on clang-stage1-cmake-RA_check.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@259665 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/config-ix.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 264085e65..312f0e060 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -299,6 +299,9 @@ set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64}) if(APPLE) include(CompilerRTDarwinUtils) + # tsan fails almost everything for x86_64h + list(REMOVE_ITEM ALL_TSAN_SUPPORTED_ARCH x86_64h) + # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not # the command line tools. If this is the case, we need to find the OS X # sysroot to pass to clang. |