diff options
| author | David Spickett <david.spickett@linaro.org> | 2023-10-02 09:01:11 +0000 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2023-10-02 09:02:05 +0000 |
| commit | ffc67bb3602a6a9a4f886af362e1f2d7c9821570 (patch) | |
| tree | a940ed1d8a12f976f01bbccde68ca9da93181f58 /llvm/CMakeLists.txt | |
| parent | 43198b0aa218e261ff7d72c85f6fbbc02cf3bc64 (diff) | |
| download | llvm-ffc67bb3602a6a9a4f886af362e1f2d7c9821570.zip llvm-ffc67bb3602a6a9a4f886af362e1f2d7c9821570.tar.gz llvm-ffc67bb3602a6a9a4f886af362e1f2d7c9821570.tar.bz2 | |
Revert "[Flang] [FlangRT] Introduce FlangRT project as solution to Flang's runtime LLVM integration"
This reverts commit 6403287eff71a3d6f6c862346d6ed3f0f000eb70.
This is failing on all but 1 of Linaro's flang builders.
CMake Error at /home/tcwg-buildbot/worker/clang-aarch64-full-2stage/llvm/flang-rt/unittests/CMakeLists.txt:37 (message):
Target llvm_gtest not found.
Diffstat (limited to 'llvm/CMakeLists.txt')
| -rw-r--r-- | llvm/CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 6b10af4..103c08f 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -156,10 +156,7 @@ endif() # As we migrate runtimes to using the bootstrapping build, the set of default runtimes # should grow as we remove those runtimes from LLVM_ENABLE_PROJECTS above. set(LLVM_DEFAULT_RUNTIMES "libcxx;libcxxabi;libunwind") -if ("flang" IN_LIST LLVM_ENABLE_PROJECTS) - set(LLVM_DEFAULT_RUNTIMES "libcxx;libcxxabi;libunwind;flang-rt") -endif() -set(LLVM_SUPPORTED_RUNTIMES "libc;libunwind;libcxxabi;pstl;libcxx;compiler-rt;openmp;llvm-libgcc;flang-rt") +set(LLVM_SUPPORTED_RUNTIMES "libc;libunwind;libcxxabi;pstl;libcxx;compiler-rt;openmp;llvm-libgcc") set(LLVM_ENABLE_RUNTIMES "" CACHE STRING "Semicolon-separated list of runtimes to build, or \"all\" (${LLVM_DEFAULT_RUNTIMES}). Supported runtimes are ${LLVM_SUPPORTED_RUNTIMES}.") if(LLVM_ENABLE_RUNTIMES STREQUAL "all") @@ -181,11 +178,6 @@ if ("libc" IN_LIST LLVM_ENABLE_RUNTIMES) endif() endif() -if ("flang" IN_LIST LLVM_ENABLE_PROJECTS AND NOT "flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES) - message(STATUS "Enabling Flang-rt to be built with the Flang project.") - list(APPEND LLVM_ENABLE_RUNTIMES "flang-rt") -endif() - # LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the # `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists for # several reasons: |