diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-26 20:07:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-26 21:41:38 +0200 |
| commit | 36a9f0d61aa8f98915a83ffb803527dd906f2f07 (patch) | |
| tree | 870fd7b7e1684b6f5f2bdff801044fef8e5c5740 /scripts/lib/ptxd_lib_00-init.sh | |
| parent | 2c8207e1047a709cfbdc830c5c0b4bb0aa5b5dbd (diff) | |
| download | ptxdist-36a9f0d61aa8f98915a83ffb803527dd906f2f07.tar.gz ptxdist-36a9f0d61aa8f98915a83ffb803527dd906f2f07.tar.xz | |
scripts: move ptxd_init_ptxdist_path_sysroot from ptxd_init_ptxdist_path to ptxd_make_init
it needs PTXDIST_SYSROOT_TOOLCHAIN which is defined in ptxd_make_init
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_lib_00-init.sh')
| -rw-r--r-- | scripts/lib/ptxd_lib_00-init.sh | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/scripts/lib/ptxd_lib_00-init.sh b/scripts/lib/ptxd_lib_00-init.sh index cfd89a3e5..2f9294277 100644 --- a/scripts/lib/ptxd_lib_00-init.sh +++ b/scripts/lib/ptxd_lib_00-init.sh @@ -46,40 +46,6 @@ ptxd_init_get_sysroot_base_platform() { # -# gather all sysroots -# -# out: -# PTXDIST_PATH_SYSROOT additional sysroots (without toolchain) -# PTXDIST_PATH_SYSROOT_ALL all sysroots (including toolchain) -# PTXDIST_PATH_SYSROOT_PREFIX prefixes (/, /usr) of additional sysroots (without toolchain) -# PTXDIST_PATH_SYSROOT_PREFIX_ALL prefixes (/, /usr) of all sysroots (including toolchain) -# -ptxd_init_ptxdist_path_sysroot() { - local sysroot="$(ptxd_get_ptxconf PTXCONF_SYSROOT_TARGET)" - local sysroot_prefix="${sysroot}:${sysroot}/usr" - - local sysroot_base_platform - if ptxd_init_get_sysroot_base_platform; then - sysroot="${sysroot}:${sysroot_base_platform}" - sysroot_prefix="${sysroot_prefix}:${sysroot_base_platform}:${sysroot_base_platform}/usr" - fi - - local sysroot_all="${sysroot}" - local sysroot_prefix_all="${sysroot_prefix}" - if [ -n "${PTXDIST_SYSROOT_TOOLCHAIN}" ]; then - sysroot_all="${sysroot_all}:${PTXDIST_SYSROOT_TOOLCHAIN}" - sysroot_prefix_all="${sysroot_prefix}:${PTXDIST_SYSROOT_TOOLCHAIN}:${PTXDIST_SYSROOT_TOOLCHAIN}/usr" - fi - - export \ - PTXDIST_PATH_SYSROOT="${sysroot}" \ - PTXDIST_PATH_SYSROOT_ALL="${sysroot_all}" \ - PTXDIST_PATH_SYSROOT_PREFIX="${sysroot_prefix}" \ - PTXDIST_PATH_SYSROOT_PREFIX_ALL="${sysroot_prefix_all}" -} - - -# # # ptxd_init_ptxdist_path() { @@ -106,8 +72,6 @@ ptxd_init_ptxdist_path() { PTXDIST_PATH_PLATFORMS_XLBSP="${PTXDIST_PATH_PLATFORMS//://xlbsp:}" export PTXDIST_PATH_PLATFORMS_XLBSP - - ptxd_init_ptxdist_path_sysroot } |