summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-04-07 16:37:49 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-04-08 08:24:40 +0200
commitb583952d3b0ab818b7430af3e15b25c2986d4d97 (patch)
treeee230688a3197679a527dab90839069cd6a9fcf0
parent7a90f622f3e46e1cbae6ddc4c4debe4ae62a3e52 (diff)
downloadptxdist-2021.04.0.tar.gz
ptxdist-2021.04.0.tar.xz
ptxdist: reorder icecc environment creationptxdist-2021.04.0
Without this, clang may be missing from the environment. The problem is, that the real/clang symlink is provided by ptxd_lib_setup_target_wrapper because the clang from the toolchain can be used as a host compiler as well. So run ptxd_lib_setup_host_icecc later to ensure that this symlink was already created. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-xbin/ptxdist4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist
index 80f21064d..d57574f8c 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -541,7 +541,6 @@ check_compiler() {
wrapper_dir="${sysroot_host}/lib/wrapper"
ptxd_lib_setup_host_wrapper &&
- ptxd_lib_setup_host_icecc &&
if ! ptxd_get_ptxconf PTXCONF_BUILD_TOOLCHAIN >/dev/null; then
local toolchain compiler_prefix
@@ -554,6 +553,9 @@ check_compiler() {
ptxd_lib_setup_target_icecc
fi &&
+ # ptxd_lib_setup_target_wrapper provides the real/clang symlink needed here
+ ptxd_lib_setup_host_icecc &&
+
PATH="${wrapper_dir}:${PATH}"
}