summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 14:32:36 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 14:33:49 +0100
commit10e3605477abfabab01fa60c320fff7e6d5776e8 (patch)
tree99ed98453c36975f632247df1232081fedbcb874
parent89397c4e10d630eb16d889e7f035efbaaceedf02 (diff)
downloadptxdist-10e3605477abfabab01fa60c320fff7e6d5776e8.tar.gz
ptxdist-10e3605477abfabab01fa60c320fff7e6d5776e8.tar.xz
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 <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_make_world_common.sh7
1 files changed, 6 insertions, 1 deletions
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