fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -2,17 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-#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 (LINUX OR APPLE)
 #	set_c_cxx_flag("-pedantic")
 #	set_c_cxx_flag("-Wall")
 #endif()
 
-set(GENERATED "${CMAKE_BINARY_DIR}/src/trusted/service_runtime")
+set(GENERATED_ROOT "${CMAKE_BINARY_DIR}/gen")
+set(GENERATED "${GENERATED_ROOT}/native_client/src/trusted/service_runtime")
 
 # ----------------------------------------------------------
 # TODO(robertm): this library is too big and needs to be split up
@@ -162,12 +160,14 @@ elseif (APPLE)
 
 	file(WRITE "${GENERATED_NACL_EXC_C}" "#include <mach/exc.defs>")
 
+	# It works with clang but not with default cc (which is clang).
 	execute_process(
-		COMMAND "${CMAKE_C_COMPILER}" "${CMAKE_C_COMPILER_FLAGS}" -E -
-		INPUT_FILE "${GENERATED_NACL_EXC_C}"
+		COMMAND "clang" "${CMAKE_C_COMPILER_FLAGS}" -E "${GENERATED_NACL_EXC_C}"
 		OUTPUT_FILE "${GENERATED_NACL_EXC_DEFS}"
 	)
 
+	include_directories("${GENERATED_ROOT}")
+
 	execute_process(
 		COMMAND "${PYTHON}"
 			"${CMAKE_CURRENT_LIST_DIR}/osx/run_mig.py"