diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-05-21 08:12:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-05-21 08:23:24 +0200 |
| commit | b28f6ea53508bdd8c4b973791a5eb973b83c1544 (patch) | |
| tree | 8f8147d62a14501a9156b6d114fa931e31c0ef62 | |
| parent | a17f1ce2ec28aa5b38ea4969c6694ce0f1437ad8 (diff) | |
| download | OSELAS.Toolchain-b28f6ea53508bdd8c4b973791a5eb973b83c1544.tar.gz OSELAS.Toolchain-b28f6ea53508bdd8c4b973791a5eb973b83c1544.tar.xz | |
don't used old icecc versions for cross compiling
To get a usefull target environment, we use icecc-create-env to package it,
then extract it and strip all binaries and then package it again.
Without the extra step the environment is huge, because the binaries are
not stripped at that point. However, if icecc-create-env compresses the
environment then all of this takes a long time.
And glibc 2.33 fails to build with old icecc versions.
So just avoid the whole issue on old distros and don't create a target
icecc environment.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | scripts/icecc-create-env-wrapper | 6 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_compiler.sh | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/scripts/icecc-create-env-wrapper b/scripts/icecc-create-env-wrapper index 31581c9..3f112c9 100755 --- a/scripts/icecc-create-env-wrapper +++ b/scripts/icecc-create-env-wrapper @@ -1,10 +1,6 @@ #!/bin/bash -if grep -q -- --compression "${PTXDIST_ICECC_CREATE_ENV_REAL}"; then - args=( --compression none ) -fi - -"${PTXDIST_ICECC_CREATE_ENV_REAL}" "${@}" "${args[@]}" || exit +"${PTXDIST_ICECC_CREATE_ENV_REAL}" "${@}" --compression none || exit ptxd_get_path *.tar* env="${ptxd_reply}" diff --git a/scripts/lib/ptxd_make_compiler.sh b/scripts/lib/ptxd_make_compiler.sh index baf6f9a..733b068 100644 --- a/scripts/lib/ptxd_make_compiler.sh +++ b/scripts/lib/ptxd_make_compiler.sh @@ -20,9 +20,11 @@ ptxd_make_setup_target_compiler() { compiler_prefix="$(ptxd_get_ptxconf PTXCONF_COMPILER_PREFIX)" ptxd_lib_setup_target_wrapper && - PTXDIST_ICECC_CREATE_ENV_REAL="${PTXDIST_ICECC_CREATE_ENV}" \ - PTXDIST_ICECC_CREATE_ENV="${PTXDIST_WORKSPACE}/scripts/icecc-create-env-wrapper" \ - ptxd_lib_setup_target_icecc + if [ -n "${PTXDIST_ICECC}" ] && "${PTXDIST_ICECC}" --help | grep -q ICECC_ENV_COMPRESSION; then + PTXDIST_ICECC_CREATE_ENV_REAL="${PTXDIST_ICECC_CREATE_ENV}" \ + PTXDIST_ICECC_CREATE_ENV="${PTXDIST_WORKSPACE}/scripts/icecc-create-env-wrapper" \ + ptxd_lib_setup_target_icecc + fi } export -f ptxd_make_setup_target_compiler |