fixup

Author: illwieckz

CMakeLists.txt

@@ -3,9 +3,14 @@ cmake_minimum_required(VERSION 3.28)
 project(native_client C CXX ASM)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 include(DaemonPlatform/Platform)
 include(NaClFlags)
 
+if (NOT PYTHON)
+	set(PYTHON "python3")
+endif()
+
 include_directories("include-hax")
 
 if (ARCH STREQUAL "i686")

src/trusted/service_runtime/CMakeLists.txt

@@ -482,6 +482,20 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 	set_target_properties(nacl_bootstrap PROPERTIES COMPILE_FLAGS "${BOOTSTRAP_FLAGS_STRING}")
 	set_target_properties(nacl_bootstrap PROPERTIES COMPILE_DEFINITIONS "${BOOTSTRAP_DEFINITIONS_STRING}")
 
+	add_custom_target(nacl_bootstrap_raw
+		COMMAND env CXX="${CMAKE_CXX_COMPILER}" "${PYTHON}"
+			"${CMAKE_CURRENT_LIST_DIR}/linux/ld_bfd.py" "${COMPILER_OVERRIDE}"
+			-m "${LD_EMUL}"
+			--build-id
+			-static
+			-z "max-page-size=0x1000"
+			--defsym RESERVE_TOP="${RESERVE_TOP}"
+			--script "${CMAKE_CURRENT_LIST_DIR}/linux/nacl_bootstrap.x"
+			-o "${CMAKE_BINARY_DIR}/src/trusted/service_runtime/nacl_bootstrap_raw"
+			"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/nacl_bootstrap.dir/linux/nacl_bootstrap.c.o"
+		DEPENDS nacl_bootstrap
+	)
+
 #TODO:	bootstrap_raw = bootstrap_env.Command(
 #TODO:		'nacl_bootstrap_raw',
 #TODO:		[bootstrap_obj],