[PATCH] D90005: [runtimes] Do not set XXX_STANDALONE_BUILD for libc++/abi/unwind

[Louis Dionne via Phabricator via llvm-commits]

ldionne created this revision.
ldionne added reviewers: phosek, smeenai.
Herald added subscribers: llvm-commits, jkorous, mgorny.
Herald added a project: LLVM.
ldionne requested review of this revision.

The runtimes build was lying to the various runtimes builds by setting
XXX_STANDALONE_BUILD=ON when they are really not being built standalone.
Only COMPILER_RT_STANDALONE_BUILD appears to be necessary, but setting it
for the other runtimes actually breaks everything.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D90005

Files:
  llvm/runtimes/CMakeLists.txt


Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -133,11 +133,13 @@
     string(REPLACE "-" "_" canon_name ${projName})
     string(TOUPPER ${canon_name} canon_name)
 
-    # The subdirectories need to treat this as standalone builds. D57992 tried
-    # to get rid of this, but the runtimes treat *_STANDALONE_BUILD=OFF as if
-    # llvm & clang are configured in the same CMake, and setup dependencies
+    # compiler-rt needs to treat this as standalone builds. D57992 tried
+    # to get rid of it for compiler-rt, but it treats *_STANDALONE_BUILD=OFF
+    # as if llvm & clang are configured in the same CMake, and setup dependencies
     # against their targets.
-    set(${canon_name}_STANDALONE_BUILD ON)
+    if ("${canon_name}" STREQUAL "COMPILER_RT")
+      set(${canon_name}_STANDALONE_BUILD ON)
+    endif()
 
     if(LLVM_RUNTIMES_LIBDIR_SUBDIR)
       set(${canon_name}_LIBDIR_SUBDIR "${LLVM_RUNTIMES_LIBDIR_SUBDIR}" CACHE STRING "" FORCE)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D90005.300157.patch
Type: text/x-patch
Size: 1079 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201023/190237b8/attachment.bin>