fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -8,16 +8,47 @@ project(service_runtime C CXX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake)
 
+macro(set_c_flag FLAG)
+	if (${ARGC} GREATER 1)
+		set(CMAKE_C_FLAGS_${ARGV1} "${CMAKE_${lang}_FLAGS_${ARGV1}} ${FLAG}")
+	else()
+		set(CMAKE_C_FLAGS "${CMAKE_${lang}_FLAGS} ${FLAG}")
+	endif()
+endmacro()
+
+macro(set_c_cxx_flag FLAG)
+	foreach(lang C CXX)
+		if (${ARGC} GREATER 1)
+			set(CMAKE_${lang}_FLAGS_${ARGV1} "${CMAKE_${lang}_FLAGS_${ARGV1}} ${FLAG}")
+		else()
+			set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} ${FLAG}")
+		endif()
+	endforeach()
+endmacro()
+
+macro(set_linker_flag FLAG)
+	if (${ARGC} GREATER 1)
+		set(CMAKE_EXE_LINKER_FLAGS_${ARGV1} "${CMAKE_EXE_LINKER_FLAGS_${ARGV1}} ${FLAG}")
+		set(CMAKE_SHARED_LINKER_FLAGS_${ARGV1} "${CMAKE_SHARED_LINKER_FLAGS_${ARGV1}} ${FLAG}")
+		set(CMAKE_MODULE_LINKER_FLAGS_${ARGV1} "${CMAKE_MODULE_LINKER_FLAGS_${ARGV1}} ${FLAG}")
+	else()
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAG}")
+		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${FLAG}")
+		set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${FLAG}")
+	endif()
+endmacro()
+
 include(DaemonPlatform/Platform)
 
 #FIXME: What to do with this?
 set(CPPPATH "${CMAKE_BINARY_DIR}/gen")
 
 # normally comment out -- uncomment out to test the pedantic removal
 # check below.
-#if env.Bit('linux') or env.Bit('mac'):
-#  env.FilterOut(CCFLAGS=['-pedantic'])
-#  env.FilterOut(CCFLAGS=['-Wall'])
+#if (LINUX OR APPLE)
+#	set_c_cxx_flag("-pedantic")
+#	set_c_cxx_flag("-Wall")
+#endif()
 
 set(GENERATED "${CMAKE_BINARY_DIR}/gen/native_client/src/trusted/service_runtime")
 
@@ -266,8 +297,9 @@ if (LINUX)
 		# on i386.
 		# See https://code.google.com/p/nativeclient/issues/detail?id=3581.
 #TODO:		nacl_signal_env.FilterOut(CCFLAGS=['-fstack-protector', '-fstack-protector-all'])
-#TODO:		nacl_signal_env.Append(CCFLAGS=['-fno-stack-protector'])
+		set_c_cxx_flag("-fno-stack-protector")
 #TODO:		NACL_SIGNAL_OBJ = nacl_signal_env.ComponentObject('linux/nacl_signal.c')])
+
 		set(LDR_INPUTS ${LDR_INPUTS} ${NACL_SIGNAL_OBJ})
 	endif()
 endif()
@@ -399,16 +431,19 @@ 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'],
-#TODO:		CFLAGS=['-Wdeclaration-after-statement'])
-#TODO:	bootstrap_env.Append(CCFLAGS=['-fno-pic', '-fno-PIC', '-fno-pie', '-fno-pie',
-#TODO:		'-fno-stack-protector'])
+		set_c_cxx_flag("-fno-pic")
+		set_c_cxx_flag("-fno-PIC")
+		set_c_cxx_flag("-fno-pie")
+		set_c_cxx_flag("-fno-pie")
+		set_c_cxx_flag("-fno-stack-protector")
+		set_c_flag("-Wdeclaration-after-statement")
 
 	# TODO(bbudge) Remove -Qunused-arguments when Clang supports -fno-pic.
 	if (DAEMON_CXX_COMPILER_Clang_COMPATIBILITY)
-#TODO:		bootstrap_env.Append(CCFLAGS=['-ffreestanding',
-#TODO:			'-U__STDC_HOSTED__',
-#TODO:			'-D__STDC_HOSTED__=1',
-#TODO:			'-Qunused-arguments'])
+		set_c_cxx_flag("-ffreestanding")
+		add_definitions(-U__STDC_HOSTED__)
+		add_definitions(-D__STDC_HOSTED__=1)
+		add_definitions(-Qunused-arguments)
 	endif()
 
 	set(COMPILER_OVERRIDE '')
@@ -441,7 +476,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.
-#TODO:			bootstrap_env.Append(CCFLAGS=['-mcmodel=large'])
+			set_c_cxx_flag("-mcmodel=large")
 		else()
 			set(reserve_top '0x0')
 		endif()