summaryrefslogtreecommitdiffstats
path: root/rules/pre
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-08-09 15:25:05 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-02 16:06:19 +0200
commit93d824b053d8745cdf321de938bb52b3563479cd (patch)
tree598f776fa1e428b0fee30bf8adb915a22c26eaac /rules/pre
parentea0106ebe3ec9574e9b904a2a64a7ac6d31d0a31 (diff)
downloadOSELAS.Toolchain-93d824b053d8745cdf321de938bb52b3563479cd.tar.gz
OSELAS.Toolchain-93d824b053d8745cdf321de938bb52b3563479cd.tar.xz
pre/toolchain: prepare to install most packages to pkgdir first
This allows properly cleaning individual packages during testing and brings the toolchain closer to regular PTXdist BSPs. This makes it possible to reuse more generic code. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/pre')
-rw-r--r--rules/pre/toolchain.make8
1 files changed, 5 insertions, 3 deletions
diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make
index 76227ca..b809823 100644
--- a/rules/pre/toolchain.make
+++ b/rules/pre/toolchain.make
@@ -16,6 +16,7 @@ PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT := $(call remove_quotes, $(PTXCONF_CROSS_GC
PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS))
PTXCONF_CROSS_GCC_CONFIG_LIBSSP := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_LIBSSP))
PTXCONF_CROSS_GCC_CONFIG_SHARED := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_SHARED))
+PTXCONF_PREFIX_CROSS := $(call remove_quotes, $(PTXCONF_PREFIX_CROSS))
PTXCONF_ARCH := $(call remove_quotes, $(PTXCONF_ARCH))
@@ -63,14 +64,15 @@ endif
# gcc-first
#
CROSS_GCC_FIRST_PREFIX := $(PTXDIST_PLATFORMDIR)/sysroot-target
-CROSS_PATH := $(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/sbin:$(CROSS_GCC_FIRST_PREFIX)/bin:$(PATH)
+CROSS_PATH := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin:$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/sbin:$(CROSS_GCC_FIRST_PREFIX)/bin:$(PATH)
+HOST_CROSS_PATH := $(CROSS_PATH)
#
# debuggable gcc/glibc
#
ifdef PTXCONF_TOOLCHAIN_DEBUG
-BUILDDIR_DEBUG := $(PTXCONF_SYSROOT_CROSS)/src/target
-BUILDDIR_CROSS_DEBUG := $(PTXCONF_SYSROOT_CROSS)/src/cross
+BUILDDIR_DEBUG := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/src/target
+BUILDDIR_CROSS_DEBUG := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/src/cross
else
BUILDDIR_DEBUG := $(BUILDDIR)
BUILDDIR_CROSS_DEBUG := $(CROSS_BUILDDIR)