cmake: do not use Clang anymore to build the helper bootstrap

Author: illwieckz

CMakeLists.txt

@@ -113,76 +113,5 @@ if (BUILD_NACL_LOADER)
 endif()
 
 if (BUILD_NACL_HELPER_BOOTSTRAP)
-	option(BUILD_NACL_HELPER_BOOTSTRAP_WITH_CLANG "Build the nacl_helper_bootstrap program with Clang." ON)
-endif()
-
-if (BUILD_NACL_HELPER_BOOTSTRAP)
-	if (DAEMON_C_COMPILER_Clang_COMPATIBILITY)
-		set(BUILD_BOOTSTRAP_DIRECTLY ON)
-	elseif (NOT BUILD_NACL_HELPER_BOOTSTRAP_WITH_CLANG)
-		set(BUILD_BOOTSTRAP_DIRECTLY ON)
-	endif()
-
-	if (BUILD_BOOTSTRAP_DIRECTLY)
-		add_subdirectory(src/trusted/service_runtime/linux)
-	else()
-		if (CMAKE_GENERATOR MATCHES "Visual Studio")
-			set(BOOTSTRAP_GENERATOR "NMake Makefiles")
-		else()
-			set(BOOTSTRAP_GENERATOR "${CMAKE_GENERATOR}")
-		endif()
-
-		find_program(CLANG_C_COMPILER NAMES "clang" DOC "Path to the Clang C compiler." REQUIRED)
-		find_program(CLANG_CXX_COMPILER NAMES "clang++" DOC "Path to the Clang C++ compiler." REQUIRED)
-		find_program(CLANG_ASM_COMPILER NAMES "clang" DOC "Path to the Clang Asm compiler." REQUIRED)
-
-		if (NOT COMPILER_TARGET)
-			execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -dumpmachine
-				OUTPUT_VARIABLE COMPILER_TARGET
-				OUTPUT_STRIP_TRAILING_WHITESPACE
-				# CMake 3.18.4 from Debian Buster doesn't support that option:
-				# COMMAND_ERROR_IS_FATAL ANY
-			)
-
-			if (NOT COMPILER_TARGET)
-				message(FATAL_ERROR "Failed to read the compiler target.")
-			endif()
-		endif()
-
-		foreach(inherited_option ${INHERITED_OPTIONS})
-			list(APPEND INHERITED_OPTION_ARGS "-D${inherited_option}=${${inherited_option}}")
-		endforeach()
-
-		set(BOOTSTRAP_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/nacl_helper_bootstrap-build")
-
-		include(ExternalProject)
-
-		ExternalProject_Add(nacl_helper_bootstrap-project
-			SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
-			BINARY_DIR "${BOOTSTRAP_BUILD_DIR}"
-			CMAKE_GENERATOR "${BOOTSTRAP_GENERATOR}"
-			CMAKE_ARGS
-				"-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
-				"-DCMAKE_C_COMPILER=${CLANG_C_COMPILER}"
-				"-DCMAKE_CXX_COMPILER=${CLANG_CXX_COMPILER}"
-				"-DCMAKE_ASM_COMPILER=${CLANG_ASM_COMPILER}"
-				"-DCMAKE_C_COMPILER_TARGET=${COMPILER_TARGET}"
-				"-DCMAKE_CXX_COMPILER_TARGET=${COMPILER_TARGET}"
-				"-DCMAKE_ASM_COMPILER_TARGET=${COMPILER_TARGET}"
-				-DBUILD_NACL_LOADER=OFF
-				-DBUILD_NACL_HELPER_BOOTSTRAP=ON
-				${INHERITED_OPTION_ARGS}
-			# CMake 3.18.4 from Debian Buster doesn't support that option:
-			# INSTALL_BYPRODUCTS
-			INSTALL_COMMAND echo
-		)
-
-		add_custom_target(nacl_helper_bootstrap ALL
-			COMMAND "${CMAKE_COMMAND}" -E copy "${BOOTSTRAP_BUILD_DIR}/nacl_helper_bootstrap"
-				"${CMAKE_CURRENT_BINARY_DIR}/nacl_helper_bootstrap"
-			BYPRODUCTS
-				"${CMAKE_CURRENT_BINARY_DIR}/nacl_helper_bootstrap"
-			DEPENDS nacl_helper_bootstrap-project
-		)
-	endif()
+	add_subdirectory(src/trusted/service_runtime/linux)
 endif()