summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-11-16 19:14:43 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-16 12:37:18 +0200
commit9b7b05e2c4a7effadd6ef7392834f16da5993442 (patch)
treed7c10f5fe4c1805c16c69effb9339d6c3e0ac16c
parent6eead9787382ab4bb798964eaf056d717c4a022c (diff)
downloadOSELAS.Toolchain-9b7b05e2c4a7effadd6ef7392834f16da5993442.tar.gz
OSELAS.Toolchain-9b7b05e2c4a7effadd6ef7392834f16da5993442.tar.xz
cross-gcc-first: cleanup
Don't reuse the cross-gcc source tree. It breaks 'ptxdist -j'. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/cross-gcc-first.make24
1 files changed, 14 insertions, 10 deletions
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make
index 5fc4a84..2bc438b 100644
--- a/rules/cross-gcc-first.make
+++ b/rules/cross-gcc-first.make
@@ -16,7 +16,20 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GCC_FIRST) += cross-gcc-first
#
# Paths and names
#
-CROSS_GCC_FIRST_BUILDDIR = $(CROSS_BUILDDIR)/$(CROSS_GCC)-first-build
+CROSS_GCC_FIRST_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION))
+CROSS_GCC_FIRST_DL_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_DL_VERSION))
+CROSS_GCC_FIRST_MD5 := $(call remove_quotes,$(PTXCONF_CROSS_GCC_MD5))
+CROSS_GCC_FIRST := gcc-$(CROSS_GCC_FIRST_DL_VERSION)
+ifeq ($(CROSS_GCC_FIRST_VERSION),$(CROSS_GCC_FIRST_DL_VERSION))
+CROSS_GCC_FIRST_SUFFIX := tar.bz2
+else
+CROSS_GCC_FIRST_SUFFIX := tar.xz
+endif
+CROSS_GCC_FIRST_SOURCE := $(SRCDIR)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
+CROSS_GCC_FIRST_DIR := $(CROSS_BUILDDIR)/gcc-first-$(CROSS_GCC_FIRST_VERSION)
+CROSS_GCC_FIRST_BUILDDIR := $(CROSS_GCC_FIRST_DIR)-build
+CROSS_GCC_FIRST_URL = $(CROSS_GCC_URL)
+CROSS_GCC_FIRST_BUILD_OOT := YES
# ----------------------------------------------------------------------------
# Prepare
@@ -46,15 +59,6 @@ CROSS_GCC_FIRST_CONF_OPT = \
--disable-libatomic \
--with-system-zlib
-$(STATEDIR)/cross-gcc-first.prepare: $(STATEDIR)/cross-gcc.extract
- @$(call targetinfo)
- @$(call clean, $(CROSS_GCC_FIRST_BUILDDIR))
- mkdir -p $(CROSS_GCC_FIRST_BUILDDIR)
- cd $(CROSS_GCC_FIRST_BUILDDIR) && \
- $(CROSS_GCC_FIRST_PATH) $(CROSS_GCC_FIRST_ENV) \
- $(CROSS_GCC_DIR)/configure $(CROSS_GCC_FIRST_CONF_OPT)
- @$(call touch)
-
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------