fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -469,7 +469,7 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 	elseif (ARCH STREQUAL "armhf")
 		set(LD_EMUL "armelf_linux_eabi")
 		set(RESERVE_TOP "0x40002000")
-		set(COMPILER_OVERRIDE "--compiler arm-linux-gnueabihf-gcc")
+		set(COMPILER_OVERRIDE "arm-linux-gnueabihf-gcc")
 	elseif (ARCH STREQUAL "mips32")
 		set(LD_EMOUL "elf32ltsmip")
 		set(RESERVE_TOP "0x40008000")
@@ -482,19 +482,35 @@ 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}")
 
-	add_custom_target(nacl_bootstrap_raw
-		COMMAND env CXX="${CMAKE_CXX_COMPILER}" "${PYTHON}"
-			"${CMAKE_CURRENT_LIST_DIR}/linux/ld_bfd.py" "${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
-	)
+	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
+		)
+	endif()
 
 	add_custom_target(nacl_helper_bootstrap
 		COMMAND "${PYTHON}"
@@ -504,7 +520,7 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 		DEPENDS nacl_bootstrap_raw
 	)
 
-	add_dependencies(sel_ldr nacl_bootstrap_raw)
+	add_dependencies(sel_ldr nacl_helper_bootstrap)
 
 #TODO:	bootstrap_raw = bootstrap_env.Command(
 #TODO:		'nacl_bootstrap_raw',