summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-06-01 07:47:38 -0700
committerSteve Sakoman <steve@sakoman.com>2023-06-21 06:50:52 -1000
commit64c5104462847db8e8a9b0b3b76d1296f85c1d0a (patch)
treeb172fbf24a070aefdd86d175218f1cdb4e737cd6
parentc8075f33190981606deadc6458d7399426ce7c1a (diff)
downloadpoky-64c5104462847db8e8a9b0b3b76d1296f85c1d0a.tar.gz
cmake.bbclass: do not search host paths for find_program()
OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM[1] controls the search behavior of find_program(). When this variable's value was first used in OE, it was deliberately set to BOTH to allow searching of host tools. This is to ensure the necessary tools from host could be used. The downside is that the configure behavior may differ on different host environments. Later, this cmake.bbclass was added the ability to search tools under the HOSTTOOLS_DIR. This means we no longer needs cmake to search the host paths. So we remove the class-native setting of BOTH. [1] https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.html (From OE-Core rev: 1e2866eb0ce0c10a2668fbd66bc28526eec30f4d) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f4ea12f6635125ee793f4dd801c538c0186f9dc3) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-recipe/cmake.bbclass1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass
index 554b948c32..2f5114b6b5 100644
--- a/meta/classes-recipe/cmake.bbclass
+++ b/meta/classes-recipe/cmake.bbclass
@@ -61,7 +61,6 @@ OECMAKE_PERLNATIVE_DIR ??= ""
61OECMAKE_EXTRA_ROOT_PATH ?= "" 61OECMAKE_EXTRA_ROOT_PATH ?= ""
62 62
63OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY" 63OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
64OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM:class-native = "BOTH"
65 64
66EXTRA_OECMAKE:append = " ${PACKAGECONFIG_CONFARGS}" 65EXTRA_OECMAKE:append = " ${PACKAGECONFIG_CONFARGS}"
67 66