diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-21 16:43:05 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-21 16:43:09 +0100 |
| commit | 35d6b9c03b7f606c2ea85ed2f58714dc3149a2c1 (patch) | |
| tree | 43c172dc3263638caf7f6f6613863158b251b322 /scripts/lib/ptxd_make_world_common.sh | |
| parent | 4757ea7329173a27ec7621807b55d1f911e6a067 (diff) | |
| download | ptxdist-35d6b9c03b7f606c2ea85ed2f58714dc3149a2c1.tar.gz ptxdist-35d6b9c03b7f606c2ea85ed2f58714dc3149a2c1.tar.xz | |
make sure $CC and $CXX are set for meson
Meson uses those as host compiler. If the variables are not set, then meson
tries to autodetect what should be used and may decide to use ccache.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index ebc3ac22d..90cac76c0 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -312,9 +312,10 @@ ptxd_make_world_init() { ;; meson) local conf_opt_ptr="ptx_conf_opt_${pkg_conf_tool}_${pkg_type}${conf_opt_ext}" + 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}" + pkg_conf_env="PTXDIST_ICECC= ${pkg_conf_env:-${!conf_env_ptr}}" # Try to find a suitable UTF-8 locale on all distros local c_locale |