diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-06 13:09:33 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-06 13:12:28 +0100 |
| commit | 3e4421e737f5533673e2fbbd3b7f11aac68c88ff (patch) | |
| tree | 01af91dc6dcbd53da9d3811846855f47854d8dd2 | |
| parent | feec38a26907933ca75a00caee509746066ecaff (diff) | |
| download | ptxdist-3e4421e737f5533673e2fbbd3b7f11aac68c88ff.tar.gz ptxdist-3e4421e737f5533673e2fbbd3b7f11aac68c88ff.tar.xz | |
ptxd_make_world_init: hide cmake for new meson version
With the new meson version, CMAKE_FOR_BUILD is used to overwrite the cmake
binary when cross compiling. So set both to ensure that cmake is never
found.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 3f0efe1bc..28f00c59f 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -353,7 +353,7 @@ ptxd_make_world_init() { local conf_env_ptr="ptx_conf_env_${pkg_conf_tool}_${pkg_type}" pkg_conf_opt="${pkg_conf_opt:-${!conf_opt_ptr}}" - pkg_conf_env="PTXDIST_ICECC= CMAKE=false ${pkg_conf_env:-${!conf_env_ptr}}" + pkg_conf_env="PTXDIST_ICECC= CMAKE=false CMAKE_FOR_BUILD=false ${pkg_conf_env:-${!conf_env_ptr}}" ;; *) local conf_env_ptr="ptx_conf_env_${pkg_type}" |