Browse Source

arch sometimes required for cmake cross-compiles

Waldemar Brodkorb 9 years ago
parent
commit
59a9771ada
2 changed files with 2 additions and 0 deletions
  1. 1 0
      mk/pkg-bottom.mk
  2. 1 0
      scripts/toolchain.cmake.in

+ 1 - 0
mk/pkg-bottom.mk

@@ -63,6 +63,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
 	 	-e "s#@@TARGET_CXX@@#$(TARGET_CXX)#" \
 		-e "s#@@TARGET_CFLAGS@@#$(TARGET_CFLAGS)#" \
 		-e "s#@@TARGET_CXXFLAGS@@#$(TARGET_CXXFLAGS)#" \
+		-e "s#@@TARGET_ARCH@@#$(ADK_TARGET_ARCH)#" \
 		-e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \
 		-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \
 		$(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake

+ 1 - 0
scripts/toolchain.cmake.in

@@ -1,4 +1,5 @@
 set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR @@TARGET_ARCH@@)
 set(CMAKE_C_COMPILER @@TARGET_CC@@)
 set(CMAKE_CXX_COMPILER @@TARGET_CXX@@)
 set(CMAKE_SYSTEM_NAME Linux)