diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-02-13 12:09:11 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-02-13 12:09:11 +0000 |
| commit | 946bd23428e4f163cdedc0edad914dbb73c43c7e (patch) | |
| tree | 68b955b99b1b5f6e9bb739db741b20b3b89f25ea | |
| parent | 204dea6aa777e652df7f13e9287d4070de37e91a (diff) | |
| download | OSELAS.Toolchain-946bd23428e4f163cdedc0edad914dbb73c43c7e.tar.gz OSELAS.Toolchain-946bd23428e4f163cdedc0edad914dbb73c43c7e.tar.xz | |
* rules/pre/toolchain.make, rules/cross-gcc-first.make, rules/cross-gcc-second.make, rules/glibc.make:
added abstraction to put sources in prefix for later debugging of the toolchain internals
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@1992 f8d472c7-5700-0410-ac5a-87979cec3adf
| -rw-r--r-- | rules/cross-gcc-first.make | 6 | ||||
| -rw-r--r-- | rules/cross-gcc-second.make | 2 | ||||
| -rw-r--r-- | rules/glibc.make | 9 | ||||
| -rw-r--r-- | rules/pre/toolchain.make | 8 |
4 files changed, 17 insertions, 8 deletions
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make index feba959..fbe58e9 100644 --- a/rules/cross-gcc-first.make +++ b/rules/cross-gcc-first.make @@ -22,8 +22,8 @@ CROSS_GCC_FIRST := gcc-$(CROSS_GCC_FIRST_VERSION) CROSS_GCC_FIRST_SUFFIX := tar.bz2 CROSS_GCC_FIRST_URL := $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC_FIRST)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX) CROSS_GCC_FIRST_SOURCE := $(SRCDIR)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX) -CROSS_GCC_FIRST_DIR := $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST) -CROSS_GCC_FIRST_BUILDDIR := $(CROSS_GCC_FIRST_DIR)-first-build +CROSS_GCC_FIRST_DIR := $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC_FIRST) +CROSS_GCC_FIRST_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST)-first-build # ---------------------------------------------------------------------------- # Get @@ -49,7 +49,7 @@ $(STATEDIR)/cross-gcc-first.extract: $(cross-gcc-first_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CROSS_GCC_FIRST_DIR)) @$(call clean, $(CROSS_GCC_FIRST_BUILDDIR)) - @$(call extract, CROSS_GCC_FIRST, $(CROSS_BUILDDIR)) + @$(call extract, CROSS_GCC_FIRST, $(BUILDDIR_CROSS_DEBUG)) @$(call patchin, CROSS_GCC_FIRST, $(CROSS_GCC_FIRST_DIR)) mkdir -p $(CROSS_GCC_FIRST_BUILDDIR) @$(call touch, $@) diff --git a/rules/cross-gcc-second.make b/rules/cross-gcc-second.make index 622885c..990db7b 100644 --- a/rules/cross-gcc-second.make +++ b/rules/cross-gcc-second.make @@ -17,7 +17,7 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GCC_SECOND) += cross-gcc-second # # Paths and names # -CROSS_GCC_SECOND_BUILDDIR = $(CROSS_GCC_FIRST_DIR)-second-build +CROSS_GCC_SECOND_BUILDDIR = $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST)-second-build # ---------------------------------------------------------------------------- # Get diff --git a/rules/glibc.make b/rules/glibc.make index a144bc8..0eb2092 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -22,7 +22,7 @@ GLIBC := glibc-$(GLIBC_VERSION) GLIBC_SUFFIX := tar.bz2 GLIBC_URL := $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC).$(GLIBC_SUFFIX) GLIBC_SOURCE := $(SRCDIR)/$(GLIBC).$(GLIBC_SUFFIX) -GLIBC_DIR := $(BUILDDIR)/$(GLIBC) +GLIBC_DIR := $(BUILDDIR_DEBUG)/$(GLIBC) GLIBC_BUILDDIR := $(BUILDDIR)/$(GLIBC)-build # ---------------------------------------------------------------------------- @@ -49,15 +49,16 @@ $(STATEDIR)/glibc.extract: $(glibc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GLIBC_DIR)) @$(call clean, $(GLIBC_BUILDDIR)) - @$(call extract, GLIBC) - @$(call patchin, GLIBC) + @$(call extract, GLIBC, $(BUILDDIR_DEBUG)) + @$(call patchin, GLIBC, $(GLIBC_DIR)) ifdef PTXCONF_GLIBC_LINUXTHREADS cp -r $(GLIBC_LINUXTHREADS_DIR)/linuxthreads $(GLIBC_DIR) cp -r $(GLIBC_LINUXTHREADS_DIR)/linuxthreads_db $(GLIBC_DIR) endif ifdef PTXCONF_GLIBC_PORTS - ln -sf $(GLIBC_PORTS_DIR) $(GLIBC_DIR)/ports + mkdir -p $(GLIBC_DIR)/ports + cp -r $(GLIBC_PORTS_DIR)/* $(GLIBC_DIR)/ports endif mkdir -p $(GLIBC_BUILDDIR) @$(call touch, $@) diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make index cf11e19..68b529f 100644 --- a/rules/pre/toolchain.make +++ b/rules/pre/toolchain.make @@ -5,4 +5,12 @@ SYSROOT := $(call remove_quotes,$(PTXCONF_PREFIX)/sysroot-$(PTXCONF_GNU_TARGET)) CROSS_GCC_FIST_PREFIX := $(PTXCONF_PREFIX)/gcc-first CROSS_PATH := $(call remove_quotes,$(PTXCONF_PREFIX)/bin:$(PTXCONF_PREFIX)/usr/bin:$(CROSS_GCC_FIST_PREFIX)/bin):$$PATH +ifdef PTXCONF_TOOLCHAIN_DEBUG +BUILDDIR_DEBUG := $(PTXCONF_PREFIX)/src/target +BUILDDIR_CROSS_DEBUG := $(PTXCONF_PREFIX)/src/cross +else +BUILDDIR_DEBUG := $(BUILDDIR) +BUILDDIR_CROSS_DEBUG := $(CROSS_BUILDDIR) +endif + # vim: syntax=make |