Add LLVM_BUILD_EXECUTION_ENGINE and LLVM_TOOLS_TO_BUILD cmake options, they can be used to disable the building of lib/ExecutionEngine and only build a subset of tools.

Author: vargaz

llvm/CMakeLists.txt

@@ -501,6 +501,11 @@ option(LLVM_BUILD_EXAMPLES
   "Build the LLVM example programs. If OFF, just generate build targets." OFF)
 option(LLVM_INCLUDE_EXAMPLES "Generate build targets for the LLVM examples" ON)
 
+option(LLVM_BUILD_EXECUTION_ENGINE
+	"Build lib/ExecutionEngine." ON)
+
+option(LLVM_TOOLS_TO_BUILD "List of tools to build" "")
+
 option(LLVM_BUILD_TESTS
   "Build LLVM unit tests. If OFF, just generate build targets." OFF)
 option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." ON)

llvm/cmake/modules/AddLLVM.cmake

@@ -965,10 +965,19 @@ macro(add_llvm_subdirectory project type name)
     option(${project}_${type}_${nameUPPER}_BUILD
            "Whether to build ${name} as part of ${project}" On)
     mark_as_advanced(${project}_${type}_${name}_BUILD)
-    if(${project}_${type}_${nameUPPER}_BUILD)
-      add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir} ${add_llvm_external_dir})
-      # Don't process it in add_llvm_implicit_projects().
-      set(${project}_${type}_${nameUPPER}_BUILD OFF)
+    if("${project}${type}" STREQUAL "LLVMTOOL" AND (NOT "${LLVM_TOOLS_TO_BUILD}" STREQUAL ""))
+      if("${name}" IN_LIST LLVM_TOOLS_TO_BUILD)
+        message("Building tool ${name}.")
+	    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir} ${add_llvm_external_dir})
+        # Don't process it in add_llvm_implicit_projects().
+        set(${project}_${type}_${nameUPPER}_BUILD OFF)
+      endif()
+    else()
+	  if(${${project}_${type}_${nameUPPER}_BUILD})
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir} ${add_llvm_external_dir})
+        # Don't process it in add_llvm_implicit_projects().
+        set(${project}_${type}_${nameUPPER}_BUILD OFF)
+      endif()
     endif()
   else()
     set(LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR
@@ -1329,6 +1338,9 @@ function(add_lit_target target comment)
       COMMAND ${CMAKE_COMMAND} -E echo "${target} does nothing, no tools built.")
     message(STATUS "${target} does nothing.")
   endif()
+  if( NOT LLVM_BUILD_TESTS )
+    return()
+  endif()
   if (ARG_DEPENDS)
     add_dependencies(${target} ${ARG_DEPENDS})
   endif()

llvm/cmake/modules/CrossCompile.cmake

@@ -49,6 +49,7 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype)
         -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
         -DLLVM_TARGETS_TO_BUILD="${targets_to_build_arg}"
         -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${experimental_targets_to_build_arg}"
+		-DLLVM_TOOLS_TO_BUILD=""
         ${build_type_flags} ${linker_flag} ${external_clang_dir}
     WORKING_DIRECTORY ${LLVM_${target_name}_BUILD}
     DEPENDS CREATE_LLVM_${target_name}

llvm/lib/ExecutionEngine/CMakeLists.txt

@@ -1,4 +1,6 @@
-
+if(NOT LLVM_BUILD_EXECUTION_ENGINE)
+    set(EXCLUDE_FROM_ALL ON)
+endif()
 
 add_llvm_library(LLVMExecutionEngine
   ExecutionEngine.cpp
@@ -18,10 +20,12 @@ if(BUILD_SHARED_LIBS)
   target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
 endif()
 
+if(LLVM_BUILD_EXECUTION_ENGINE)
 add_subdirectory(Interpreter)
 add_subdirectory(MCJIT)
 add_subdirectory(Orc)
 add_subdirectory(RuntimeDyld)
+endif()
 
 if( LLVM_USE_OPROFILE )
   add_subdirectory(OProfileJIT)