fixup

Author: illwieckz

src/trusted/platform_qualify/CMakeLists.txt

@@ -25,6 +25,7 @@ if (ARCH STREQUAL "i686" OR ARCH STREQUAL "amd64")
 	endif()
 
 	add_library(vcpuid OBJECT "arch/x86/vcpuid.c")
+	list(APPEND VCPUID_LIBS vcpuid)
 
 	if (ARCH STREQUAL "i686")
 		list(APPEND PQL_INPUTS "arch/x86_32/nacl_dep_qualify_arch.c")
@@ -47,4 +48,4 @@ elseif (ARCH STREQUAL "mips32")
 endif()
 
 add_library(platform_qual_lib STATIC ${PQL_INPUTS})
-target_link_libraries(platform_qual_lib vcpuid)
+target_link_libraries(platform_qual_lib ${VCPUID_LIBS})

src/trusted/service_runtime/CMakeLists.txt

@@ -317,7 +317,9 @@ elseif (ARCH STREQUAL "armhf")
 	list(APPEND LDR_LIBS arm_validator_reporters)
 endif()
 
-list(APPEND LDR_LIBS nccopy) # not listed in src/trusted/service_runtime/build.scons
+if (ARCH STREQUAL "i686" OR ARCH STREQUAL "amd64")
+	list(APPEND LDR_LIBS nccopy) # not listed in src/trusted/service_runtime/build.scons
+endif()
 
 if (WIN32)
 	set(MMAP_TEST_CHECK_CC "win/mmap_test_check.cc")

src/trusted/validator_arm/CMakeLists.txt

@@ -48,6 +48,13 @@ list(APPEND GEN_TEST_LIST
 	"gen/arm32_decode_unconditional_instructions_tests.cc"
 )
 
+list(APPEND GEN_ACTUAL_LIST
+	"gen/arm32_decode_actuals_1.cc"
+	"gen/arm32_decode_actuals_1.h"
+	"gen/arm32_decode_actuals_2.cc"
+	"gen/arm32_decode_actuals_2.h"
+)
+
 list(APPEND GEN_OTHER_LIST
 	"gen/arm32_decode.cc"
 	"gen/arm32_decode.h"
@@ -58,10 +65,7 @@ list(APPEND GEN_OTHER_LIST
 	"gen/arm32_decode_named_bases.h"
 	"gen/arm32_decode_named_decoder.h"
 	# Generated ACTUAL file names.
-	"gen/arm32_decode_actuals_1.cc"
-	"gen/arm32_decode_actuals_1.h"
-	"gen/arm32_decode_actuals_2.cc"
-	"gen/arm32_decode_actuals_2.h"
+	${GEN_ACTUAL_LIST}
 	# Generated BASELINES file names.
 	"gen/arm32_decode_baselines_1.cc"
 	"gen/arm32_decode_baselines_1.h"
@@ -79,7 +83,7 @@ list(APPEND VALIDATOR_INPUTS
 	"validator.cc"
 )
 
-add_library(arm_validatore_core OBJECT ${VALIDATOR_INPUTS} ${GEN_TEST_LIST} ${GEN_OTHER_LIST})
+add_library(arm_validatore_core OBJECT ${VALIDATOR_INPUTS} ${GEN_ACTUAL_LIST})
 
 add_library(ncvalidate_arm_v2 STATIC "ncvalidate.cc")
 target_link_libraries(ncvalidate_arm_v2 ${arm_validatore_core}) # We don't support OPTIONAL_COVERAGE_LIBS.