summaryrefslogtreecommitdiffstats
path: root/compiler-rt/cmake
diff options
context:
space:
mode:
authorDan Liew <dan@su-root.co.uk>2019-09-13 17:31:24 +0000
committerDan Liew <dan@su-root.co.uk>2019-09-13 17:31:24 +0000
commit713da8db39bb4cd1f9a1a5e67b255f6156e8929d (patch)
treec2e32215577995872cd892fecf2537d7d968a74f /compiler-rt/cmake
parentef163f5a20dcd1f79f66ae2a71d425345e5453ac (diff)
downloadbcm5719-llvm-713da8db39bb4cd1f9a1a5e67b255f6156e8929d.tar.gz
bcm5719-llvm-713da8db39bb4cd1f9a1a5e67b255f6156e8929d.zip
Fix bug in `darwin_test_archs()` when the cache variable is set but empty.
Summary: If the cache variable named in `${valid_archs}` (e.g. `DARWIN_osx_BUILTIN_ARCHS`) is set in the cache but is empty then the cache check `if(${valid_archs})` will be false so the function will probe the compiler but the `set(...)` command at the end of the function to update the cache variable will be a no-op. This is because `set(...)` will not update an existing cache variable unless the `FORCE` argument is provided. To fix this this patch adds `FORCE` so the cache is always updated. rdar://problem/55323665 Reviewers: vsk, kubamracek Subscribers: mgorny, #sanitizers, llvm-commits Tags: #llvm, #sanitizers Differential Revision: https://reviews.llvm.org/D67530 llvm-svn: 371872
Diffstat (limited to 'compiler-rt/cmake')
-rw-r--r--compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
index 969050bf91e..042c8a08dec 100644
--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -113,7 +113,7 @@ function(darwin_test_archs os valid_archs)
endif()
endforeach()
set(${valid_archs} ${working_archs}
- CACHE STRING "List of valid architectures for platform ${os}.")
+ CACHE STRING "List of valid architectures for platform ${os}." FORCE)
endfunction()
# This function checks the host cpusubtype to see if it is post-haswell. Haswell
OpenPOWER on IntegriCloud