summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-09-03 10:20:55 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-03 10:26:28 +0200
commit094c9f77f4e39472b0266a905237e7cdbeafa599 (patch)
treed950839a06cf73d18b71365c04b540f5071e522e
parent40f8e600c0dcb85ab0b8d79598cb202a85698b6a (diff)
downloadOSELAS.Toolchain-094c9f77f4e39472b0266a905237e7cdbeafa599.tar.gz
rules, scripts: use PTXDIST_SYSROOT_CROSS instead of PTXCONF_DESTDIR
It's the same thing and PTXDIST_SYSROOT_CROSS is the correct path that needs to be replaces in the future. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/cross-gcc.make4
-rw-r--r--rules/pre/toolchain.make2
-rw-r--r--scripts/lib/ptxd_make_image_tgz.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index 16834c6..8dc77fd 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -169,8 +169,8 @@ $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report
$(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)gcc
@find $(CROSS_GCC_PKGDIR) -name "*.la" -print0 | xargs -0 rm -v -f
-ifneq ($(call remove_quotes,$(PTXCONF_DESTDIR)),)
- sed -i -e 's;$(call remove_quotes,$(PTXCONF_DESTDIR));;' \
+ifneq ($(call remove_quotes,$(PTXDIST_SYSROOT_CROSS)),)
+ sed -i -e 's;$(call remove_quotes,$(PTXDIST_SYSROOT_CROSS));;' \
$(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/lib/gcc/$(PTXCONF_GNU_TARGET)/$(CROSS_GCC_VERSION)/install-tools/mkheaders.conf
endif
diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make
index a520dcd..88704b0 100644
--- a/rules/pre/toolchain.make
+++ b/rules/pre/toolchain.make
@@ -49,7 +49,7 @@ PTXDIST_HOST_LDFLAGS := -L${PTXDIST_PATH_SYSROOT_HOST_PREFIX}/lib
ifndef PTXCONF_TOOLCHAIN_DEBUG
TOOLCHAIN_CROSS_DEBUG_MAP := \
- $(call remove_quotes,$(PTXCONF_DESTDIR))= \
+ $(call remove_quotes,$(PTXDIST_SYSROOT_CROSS))= \
$(PTXDIST_WORKSPACE)/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform-
TOOLCHAIN_CROSS_DEBUG_MAP_FLAGS := \
diff --git a/scripts/lib/ptxd_make_image_tgz.sh b/scripts/lib/ptxd_make_image_tgz.sh
index cd1cb5e..3f87aa2 100644
--- a/scripts/lib/ptxd_make_image_tgz.sh
+++ b/scripts/lib/ptxd_make_image_tgz.sh
@@ -11,7 +11,7 @@ ptxd_make_image_tgz() {
ptxd_make_image_init || return
local prefix_cross="$(ptxd_get_ptxconf PTXCONF_PREFIX_CROSS)"
- local src="${PTX_AUTOBUILD_DESTDIR}${prefix_cross}"
+ local src="${PTXDIST_SYSROOT_CROSS}${prefix_cross}"
local dst="${pkg_dir}/$(dirname ${prefix_cross})"
local sysroot="${pkg_dir}${prefix_cross}"
local -a host_dirs=( \