fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -482,36 +482,30 @@ 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}")
 
+	list(APPEND NACL_BOOTSTRAP_RAW_ARGS "${CMAKE_CURRENT_LIST_DIR}/linux/ld_bfd.py")
+
 	if (COMPILER_OVERRIDE)
-		add_custom_target(nacl_bootstrap_raw
-			COMMAND env CXX="${CMAKE_CXX_COMPILER}" "${PYTHON}"
-				"${CMAKE_CURRENT_LIST_DIR}/linux/ld_bfd.py" --compiler "${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
-		)
-	else()
-		add_custom_target(nacl_bootstrap_raw
-			COMMAND env CXX="${CMAKE_CXX_COMPILER}" "${PYTHON}"
-				"${CMAKE_CURRENT_LIST_DIR}/linux/ld_bfd.py"
-				-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
-		)
+		list(APPEND NACL_BOOTSTRAP_RAW_ARGS --compiler "${COMPILER_OVERRIDE}")
 	endif()
 
+	list(APPEND NACL_BOOTSTRAP_RAW_ARGS
+		-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"
+	)
+
+
+	add_custom_target(nacl_bootstrap_raw
+		COMMAND env CXX="${CMAKE_CXX_COMPILER}" "${PYTHON}"
+			${NACL_BOOTSTRAP_RAW_ARGS}
+		DEPENDS nacl_bootstrap
+	)
+
 	add_custom_target(nacl_helper_bootstrap
 		COMMAND "${PYTHON}"
 			"${CMAKE_CURRENT_LIST_DIR}/linux/nacl_bootstrap_munge_phdr.py"