blob: c4f81b27b51523178d6e26ac90381cf9c8dc4eb6 [file] [log] [blame]
Andrew Geisslerc9f78652020-09-18 14:11:35 -05001From dd0fe8d54def4684d360b3e9b10e963ef0208202 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 27 Apr 2017 11:35:05 -0400
Brad Bishop08902b02019-08-20 09:16:51 -04004Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
5 toolchain file in sdk
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08006
7Passing the toolchain by:
8
9 - shell aliases does not work if cmake is called by a script
10 - unconditionally by a wrapper script causes cmake to believe it is
11 configuring things when it is not (for example, `cmake --build` breaks).
12
13The OE_CMAKE_TOOLCHAIN_FILE variable is only used as a default if no
14toolchain is explicitly specified.
15
16Setting the CMAKE_TOOLCHAIN_FILE cmake variable is marked as cached
17because '-D' options are cache entries themselves.
18
19Upstream-Status: Inappropriate [oe-core specific]
20Signed-off-by: Cody P Schafer <dev@codyps.com>
21Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop08902b02019-08-20 09:16:51 -040022
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023---
24 Modules/CMakeDetermineSystem.cmake | 7 +++++++
25 1 file changed, 7 insertions(+)
26
27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
Andrew Geisslerc9f78652020-09-18 14:11:35 -050028index f3ec4da..bb05656 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080029--- a/Modules/CMakeDetermineSystem.cmake
30+++ b/Modules/CMakeDetermineSystem.cmake
Brad Bishop19323692019-04-05 15:28:33 -040031@@ -81,6 +81,13 @@ else()
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032 endif()
33 endif()
34
35+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
36+ if(DEFINED ENV{OE_CMAKE_TOOLCHAIN_FILE})
37+ set(CMAKE_TOOLCHAIN_FILE "$ENV{OE_CMAKE_TOOLCHAIN_FILE}" CACHE FILEPATH "toolchain file")
38+ message(STATUS "Toolchain file defaulted to '${CMAKE_TOOLCHAIN_FILE}'")
39+ endif()
40+endif()
41+
42 # if a toolchain file is used, the user wants to cross compile.
43 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_*
44 # variables around so they can be used in CMakeLists.txt.