diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-30 14:03:43 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-30 14:04:46 -0600 |
| commit | 59a9771ada3195d973cb50c2954c215736f0d8d7 (patch) | |
| tree | 734249a94a8e5544ddb0145d768b3f5554df08c3 | |
| parent | 575f7142c7200db91d8a3b953a89e78672b4862b (diff) | |
arch sometimes required for cmake cross-compiles
| -rw-r--r-- | mk/pkg-bottom.mk | 1 | ||||
| -rw-r--r-- | scripts/toolchain.cmake.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 1112f0cc3..2c9b5c6ed 100644 --- a/mk/pkg-bottom.mk +++ b/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 diff --git a/scripts/toolchain.cmake.in b/scripts/toolchain.cmake.in index 8d9f82406..910382435 100644 --- a/scripts/toolchain.cmake.in +++ b/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) |