[llvm] 4a45f95 - [llvm] Remove LLVM_CHECK_ENABLED_PROJECTS again

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-09-24T18:49:55-04:00
New Revision: 4a45f95e7612bc5dd1d68db84df266cfcc62ff95

URL: https://github.com/llvm/llvm-project/commit/4a45f95e7612bc5dd1d68db84df266cfcc62ff95
DIFF: https://github.com/llvm/llvm-project/commit/4a45f95e7612bc5dd1d68db84df266cfcc62ff95.diff

LOG: [llvm] Remove LLVM_CHECK_ENABLED_PROJECTS again

This reverts commit 55f0b337087136554122f942fea951a357bc4a49 and
follow-up reverts commit e9ea03c62ccc1ed4e3ed4f20e37640cfdd76cbcf.

LLVM_EXTERNAL_PROJECTS is sufficient, see https://reviews.llvm.org/D110016

Added: 
    

Modified: 
    llvm/CMakeLists.txt
    llvm/cmake/modules/CrossCompile.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index cdf62cb547274..850728029ebe4 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -71,15 +71,11 @@ set(LLVM_EXTRA_PROJECTS "flang")
 set(LLVM_KNOWN_PROJECTS "${LLVM_ALL_PROJECTS};${LLVM_EXTRA_PROJECTS}")
 set(LLVM_ENABLE_PROJECTS "" CACHE STRING
 	"Semicolon-separated list of projects to build (${LLVM_KNOWN_PROJECTS}), or \"all\".")
-
-option(LLVM_CHECK_ENABLED_PROJECTS "Whether to check LLVM_ENABLE_PROJECTS" ON)
-if (LLVM_CHECK_ENABLED_PROJECTS)
-  foreach(proj ${LLVM_ENABLE_PROJECTS})
-    if (NOT proj STREQUAL "all" AND NOT proj STREQUAL "llvm" AND NOT "${proj}" IN_LIST LLVM_KNOWN_PROJECTS)
-       MESSAGE(FATAL_ERROR "${proj} isn't a known project: ${LLVM_KNOWN_PROJECTS}")
-    endif()
-  endforeach()
-endif()
+foreach(proj ${LLVM_ENABLE_PROJECTS})
+  if (NOT proj STREQUAL "all" AND NOT proj STREQUAL "llvm" AND NOT "${proj}" IN_LIST LLVM_KNOWN_PROJECTS)
+     MESSAGE(FATAL_ERROR "${proj} isn't a known project: ${LLVM_KNOWN_PROJECTS}")
+  endif()
+endforeach()
 
 if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
   set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS})

diff  --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
index 8e82d64a70d9a..179d183ed2b7d 100644
--- a/llvm/cmake/modules/CrossCompile.cmake
+++ b/llvm/cmake/modules/CrossCompile.cmake
@@ -75,7 +75,6 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
         -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${experimental_targets_to_build_arg}"
         -DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET_TRIPLE}"
         -DLLVM_TARGET_ARCH="${LLVM_TARGET_ARCH}"
-        -DLLVM_CHECK_ENABLED_PROJECTS="${LLVM_CHECK_ENABLED_PROJECTS}"
         -DLLVM_ENABLE_PROJECTS="${llvm_enable_projects_arg}"
         -DLLVM_EXTERNAL_PROJECTS="${llvm_external_projects_arg}"
         ${external_project_source_dirs}