diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-09 15:27:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-02 16:06:19 +0200 |
| commit | a3dc59de072fad3db16293121754654801998d77 (patch) | |
| tree | 987c27c3ab494439972263a75c8ba79674608743 | |
| parent | 93d824b053d8745cdf321de938bb52b3563479cd (diff) | |
| download | OSELAS.Toolchain-a3dc59de072fad3db16293121754654801998d77.tar.gz OSELAS.Toolchain-a3dc59de072fad3db16293121754654801998d77.tar.xz | |
cross-binutils: install to pkgdir
This also introduces the CROSS_BINUTILS_LD_REAL option. This will be used
by cross-elf2flt. During installation elf2flt moves 'ld' out of the way to
replace it with a wrapper. This is no longer possible with pkgdir, so we do
this manually here.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/cross-binutils.in | 3 | ||||
| -rw-r--r-- | rules/cross-binutils.make | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/rules/cross-binutils.in b/rules/cross-binutils.in index 1014c22..d29c4e4 100644 --- a/rules/cross-binutils.in +++ b/rules/cross-binutils.in @@ -27,4 +27,7 @@ config CROSS_BINUTILS_LICENSE_FILES string prompt "binutils license files" +config CROSS_BINUTILS_LD_REAL + bool + endif diff --git a/rules/cross-binutils.make b/rules/cross-binutils.make index 255ad1b..7d52201 100644 --- a/rules/cross-binutils.make +++ b/rules/cross-binutils.make @@ -35,8 +35,6 @@ CROSS_BINUTILS_URL := \ # Prepare # ---------------------------------------------------------------------------- -CROSS_BINUTILS_DEVPKG := NO - CROSS_BINUTILS_CONF_ENV := \ $(HOST_CROSS_ENV) \ CFLAGS="-ggdb3 -O2" \ @@ -63,13 +61,15 @@ CROSS_BINUTILS_CONF_OPT := \ # Install # ---------------------------------------------------------------------------- -CROSS_BINUTILS_INSTALL_OPT := \ - DESTDIR=$(PTXCONF_DESTDIR) \ - install - $(STATEDIR)/cross-binutils.install: @$(call targetinfo) @$(call world/install, CROSS_BINUTILS) +ifdef PTXCONF_CROSS_BINUTILS_LD_REAL + mv -v $(CROSS_BINUTILS_PKGDIR)$(PTXCONF_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)ld \ + $(CROSS_BINUTILS_PKGDIR)$(PTXCONF_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)ld.real + mv -v $(CROSS_BINUTILS_PKGDIR)$(PTXCONF_PREFIX_CROSS)/$(PTXCONF_GNU_TARGET)/bin/ld \ + $(CROSS_BINUTILS_PKGDIR)$(PTXCONF_PREFIX_CROSS)/$(PTXCONF_GNU_TARGET)/bin/ld.real +endif mkdir -p "$(CROSS_GCC_FIRST_PREFIX)/$(PTXCONF_GNU_TARGET)/bin" for file in \ |