summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-07-03 09:01:00 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-07-03 09:01:04 +0200
commit61cbded657f1c5c86dc3d406a38a7e291842cc53 (patch)
tree4a005ab428b691258601c7cea6121b4ff2b55c16 /scripts
parent699fd7abc5fcfe9778317f7fa5c9d424c2a4ff1f (diff)
downloadptxdist-61cbded657f1c5c86dc3d406a38a7e291842cc53.tar.gz
ptxdist-61cbded657f1c5c86dc3d406a38a7e291842cc53.tar.xz
ptxd_make_world_init: don't let meson use cmake
This might circumvent pkg-config blacklisting. This is needed only for host packages. For target packages cmake is already not in use because it is not defined in the cross file. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/ptxd_make_world_common.sh2
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 a65707b15..8710432ba 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -323,7 +323,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= ${pkg_conf_env:-${!conf_env_ptr}}"
+ pkg_conf_env="PTXDIST_ICECC= CMAKE= ${pkg_conf_env:-${!conf_env_ptr}}"
# Try to find a suitable UTF-8 locale on all distros
local c_locale