fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -405,29 +405,28 @@ endif()
 
 #TODO: env.EnsureRequiredBuildWarnings()
 
-#FIXME: This modifies (and breaks) the sel_ldr build.
-if (OFF)
 # Bootstrap loader used on Linux.
 #TODO: BUILD_ELSEWHERE = env.Bit('built_elsewhere')
 if (LINUX AND NOT BUILD_ELSEWHERE)
 #TODO:	bootstrap_env = env.Clone()
 #TODO:	bootstrap_env.Replace(CLANG_OPTS='')
 #TODO:	bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE', '-pedantic', '$COVERAGE_CCFLAGS'],
-	set_c_cxx_flag("-fno-pic")
-	set_c_cxx_flag("-fno-PIC")
-	set_c_cxx_flag("-fno-pie")
-	# Assumed to be what was expected, as -fno-pie was passed twice.
-	set_c_cxx_flag("-fno-PIE")
-	set_c_cxx_flag("-fno-stack-protector")
-	set_c_flag("-Wdeclaration-after-statement")
+	list(APPEND BOOTSTRAP_FLAGS "-fno-pic")
+	list(APPEND BOOTSTRAP_FLAGS "-fno-PIC")
+	list(APPEND BOOTSTRAP_FLAGS "-fno-pie")
+	# Assumed to be what was expected, as -fno-pie was passed twice in src/trusted/service_runtime/build.scons.
+	list(APPEND BOOTSTRAP_FLAGS "-fno-PIE")
+	list(APPEND BOOTSTRAP_FLAGS "-fno-stack-protector")
+	# Was only a C flag in src/trusted/service_runtime/build.scons.
+	list(APPEND BOOTSTRAP_FLAGS "-Wdeclaration-after-statement")
 
 	# TODO(bbudge) Remove -Qunused-arguments when Clang supports -fno-pic.
 	if (DAEMON_CXX_COMPILER_Clang_COMPATIBILITY)
-		set_c_cxx_flag("-ffreestanding")
-		add_definitions(-U__STDC_HOSTED__)
-		add_definitions(-D__STDC_HOSTED__=1)
-		add_definitions(-Qunused-arguments)
-		add_definitions(-Wno-builtin-macro-redefined)
+		list(APPEND BOOTSTRAP_FLAGS "-ffreestanding")
+		list(APPEND BOOTSTRAP_DEFINITIONS "-U__STDC_HOSTED__")
+		list(APPEND BOOTSTRAP_DEFINITIONS "-D__STDC_HOSTED__=1")
+		list(APPEND BOOTSTRAP_DEFINITIONS "-Qunused-arguments")
+		list(APPEND BOOTSTRAP_DEFINITIONS "-Wno-builtin-macro-redefined")
 	endif()
 
 	set(COMPILER_OVERRIDE "")
@@ -460,7 +459,7 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 			# truncated, which produces an error.  With mcmodel set to large,
 			# there is no restriction on the code and data, so we can
 			# safely set reserve_top to 0x100000000.
-			set_c_cxx_flag("-mcmodel=large")
+			list(APPEND BOOTSTRAP_FLAGS "-mcmodel=large")
 		else()
 			set(reserve_top "0x0")
 		endif()
@@ -476,7 +475,13 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 		set(RESERVE_TOP "0x40008000")
 	endif()
 
-#TODO:	bootstrap_obj = bootstrap_env.ComponentObject('linux/nacl_bootstrap.c')
+	string(REPLACE ";" " " BOOTSTRAP_FLAGS_STRING "${BOOTSTRAP_FLAGS}")
+	string(REPLACE ";" " " BOOTSTRAP_DEFINITIONS_STRING "${BOOTSTRAP_DEFINITIONS}")
+
+	add_library(nacl_bootstrap OBJECT "linux/nacl_bootstrap.c")
+	set_target_properties(nacl_bootstrap PROPERTIES COMPILE_FLAGS "${BOOTSTRAP_FLAGS_STRING}")
+	set_target_properties(nacl_bootstrap PROPERTIES COMPILE_DEFINITIONS "${BOOTSTRAP_DEFINITIONS_STRING}")
+
 #TODO:	bootstrap_raw = bootstrap_env.Command(
 #TODO:		'nacl_bootstrap_raw',
 #TODO:		[bootstrap_obj],
@@ -499,4 +504,3 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 #TODO:	bootstrap_env.Requires(SEL_LDR_NODE, bootstrap_out)
 #TODO:	env.SDKInstallBin('nacl_helper_bootstrap', bootstrap_prog)
 endif()
-endif()