From 10e3605477abfabab01fa60c320fff7e6d5776e8 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sat, 2 Mar 2019 14:32:36 +0100 Subject: ptxd_make_world_init: set pkg_conf_env if no conf tool is defined This is useful if world/execute is used in the prepare stage. Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_make_world_common.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 601d26a49..0cc294915 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -347,7 +347,12 @@ ptxd_make_world_init() { unset conf_opt_ptr ;; - *) ;; + *) + local conf_env_ptr="ptx_conf_env_${pkg_type}" + pkg_conf_env="PTXDIST_ICECC= ${pkg_conf_env:-${!conf_env_ptr}}" + + unset conf_env_ptr + ;; esac local -a deps_host deps_target local whitelist_host whitelist_target -- cgit v1.2.1