fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CPPPATH "${CMAKE_BINARY_DIR}/gen")
 #	set_c_cxx_flag("-Wall")
 #endif()
 
-set(GENERATED "${CMAKE_BINARY_DIR}/gen/native_client/src/trusted/service_runtime")
+set(GENERATED "${CMAKE_BINARY_DIR}/src/trusted/service_runtime")
 
 # ----------------------------------------------------------
 # TODO(robertm): this library is too big and needs to be split up
@@ -155,9 +155,27 @@ if (WIN32)
 elseif (APPLE)
 	# Rely on the c preprocessor to discover where the mach interface definitions
 	# are located.
+	set(GENERATED_NACL_EXC_C "${GENERATED}/nacl_exc.c")
 	set(GENERATED_NACL_EXC_H "${GENERATED}/nacl_exc.h")
 	set(GENERATED_NACL_EXC_SERVER_C "${GENERATED}/nacl_exc_server.c")
-	set(GENERATED_EXC_DEFS "${GENERATED}/exc.defs")
+	set(GENERATED_NACL_EXC_DEFS "${GENERATED}/exc.defs")
+
+	file(WRITE "${GENERATED_NACL_EXC_C}" "#include <mach/exc.defs>")
+
+	execute_process(
+		COMMAND "${CMAKE_C_COMPILER}" "${CMAKE_C_COMPILER_FLAGS}" -E -
+		INPUT_FILE "${GENERATED_NACL_EXC_C}"
+		OUTPUT_FILE "${GENERATED_NACL_EXC_DEFS}"
+	)
+
+	execute_process(
+		COMMAND "${PYTHON}"
+			"${CMAKE_CURRENT_LIST_DIR}/osx/run_mig.py"
+			"${GENERATED_NACL_EXC_DEFS}"
+			"${GENERATED_NACL_EXC_H}"
+			"${GENERATED_NACL_EXC_SERVER_C}"
+	)
+		
 #TODO:	env.Command([GENERATED_EXC_DEFS], [],
 #TODO:		"echo '#include <mach/exc.defs>'" +
 #TODO:		' | ${CC} ${CCFLAGS} ${CFLAGS} -E - > ${TARGET}')