diff options
| author | Dan Liew <dan@su-root.co.uk> | 2019-04-26 17:53:25 +0000 |
|---|---|---|
| committer | Dan Liew <dan@su-root.co.uk> | 2019-04-26 17:53:25 +0000 |
| commit | 9a964f67336766773653c1abf503223ed3ca29ff (patch) | |
| tree | eb2e405b129a874aa12b68dbf2f26b60a5810095 /cmake/config-ix.cmake | |
| parent | b6811a15fa4ccc1da6576b4ad654ad05ddbd2f11 (diff) | |
Revert "[CMake] Fix the value of `config.target_cflags` for non-macOS Apple"
This reverts commit 1bcdbd68616dc7f8debe126caafef7a7242a0e6b.
It's been reported that some bots are failing with this change with CMake
error like:
```
CMake Error at /b/s/w/ir/k/llvm-project/compiler-rt/cmake/config-ix.cmake:177 (message):
Unsupported architecture: arm64
Call Stack (most recent call first):
/b/s/w/ir/k/llvm-project/compiler-rt/cmake/config-ix.cmake:216 (get_target_flags_for_arch)
/b/s/w/ir/k/llvm-project/compiler-rt/test/tsan/CMakeLists.txt:78 (get_test_cflags_for_apple_platform)
```
I'm reverting the patch now to unbreak builds. I will investigate properly when time permits.
rdar://problem/50124489
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359327 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/config-ix.cmake')
| -rw-r--r-- | cmake/config-ix.cmake | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 2050b139e..b072c1180 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -205,32 +205,6 @@ macro(get_test_cc_for_arch arch cc_out cflags_out) endif() endmacro() -# Returns CFLAGS that should be used to run tests for the -# specific apple platform and architecture. -function(get_test_cflags_for_apple_platform platform arch cflags_out) - is_valid_apple_platform("${platform}" is_valid_platform) - if (NOT is_valid_platform) - message(FATAL_ERROR "\"${platform}\" is not a valid apple platform") - endif() - set(test_cflags "") - get_target_flags_for_arch(${arch} test_cflags) - list(APPEND test_cflags ${DARWIN_${platform}_CFLAGS}) - string(REPLACE ";" " " test_cflags_str "${test_cflags}") - string(APPEND test_cflags_str "${COMPILER_RT_TEST_COMPILER_CFLAGS}") - set(${cflags_out} "${test_cflags_str}" PARENT_SCOPE) -endfunction() - -function(is_valid_apple_platform platform is_valid_out) - set(is_valid FALSE) - if ("${platform}" STREQUAL "") - message(FATAL_ERROR "platform cannot be empty") - endif() - if ("${platform}" MATCHES "^(osx|((ios|watchos|tvos)(sim)?))$") - set(is_valid TRUE) - endif() - set(${is_valid_out} ${is_valid} PARENT_SCOPE) -endfunction() - set(ARM64 aarch64) set(ARM32 arm armhf) set(HEXAGON hexagon) |