diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-09 15:31:46 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-02 16:06:19 +0200 |
| commit | 7081694ff87bafc36f7bdb9b94eb67a405aab4f5 (patch) | |
| tree | 5098d6798d1ff76cd9728e5a18ffc09054692806 | |
| parent | 4702dde885888fd4cb4f21646a0b01d371404fdb (diff) | |
| download | OSELAS.Toolchain-7081694ff87bafc36f7bdb9b94eb67a405aab4f5.tar.gz OSELAS.Toolchain-7081694ff87bafc36f7bdb9b94eb67a405aab4f5.tar.xz | |
cross-gcc: install to pkgdir
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/cross-gcc-first.make | 4 | ||||
| -rw-r--r-- | rules/cross-gcc.make | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make index 84ce111..07830d2 100644 --- a/rules/cross-gcc-first.make +++ b/rules/cross-gcc-first.make @@ -53,8 +53,8 @@ CROSS_GCC_FIRST_CONF_OPT = \ --disable-shared \ --enable-languages=c \ \ - --with-ld=$(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-ld \ - --with-as=$(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-as \ + --with-ld=$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin/$(PTXCONF_GNU_TARGET)-ld \ + --with-as=$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin/$(PTXCONF_GNU_TARGET)-as \ --disable-checking \ \ --disable-libmudflap \ diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 8d32f0d..413b938 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -61,7 +61,6 @@ endif # Prepare # ---------------------------------------------------------------------------- -CROSS_GCC_DEVPKG := NO CROSS_GCC_CONF_ENV := \ $(HOST_CROSS_ENV) \ CFLAGS="-ggdb3 -O2" \ @@ -156,10 +155,6 @@ $(STATEDIR)/cross-gcc.prepare: # Install # ---------------------------------------------------------------------------- -CROSS_GCC_INSTALL_OPT := \ - DESTDIR=$(PTXCONF_DESTDIR) \ - install - $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report @$(call targetinfo) @$(call world/install, CROSS_GCC) @@ -170,8 +165,9 @@ $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report pkg_license_target_pattern=$(PTXCONF_CROSS_GCC_GCCLIBS_LICENSES) \ ptxd_make_world_copy_license - @cd "$(PTXCONF_SYSROOT_CROSS)/$(PTX_TOUPLE_TARGET)/lib"; \ - dst="$(SYSROOT)/usr/lib"; \ + @cd "$(CROSS_GCC_PKGDIR)/$(PTX_TOUPLE_TARGET)/lib"; \ + dst="$(CROSS_GCC_PKGDIR)/sysroot-$(PTXCONF_GNU_TARGET)/usr/lib"; \ + mkdir -p "$${dst}" && \ rel="$$($(ptx/abs2rel) "$${dst}" "$${PWD}")" && \ for file in \ libg2c.*so* \ @@ -194,10 +190,10 @@ $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report fi || exit 1; \ done - @find $(PTXCONF_SYSROOT_CROSS) -name "*.la" -print0 | xargs -0 rm -v -f + @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));;' \ - $(PTXCONF_SYSROOT_CROSS)/lib/gcc/$(PTXCONF_GNU_TARGET)/$(CROSS_GCC_VERSION)/install-tools/mkheaders.conf + $(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/lib/gcc/$(PTXCONF_GNU_TARGET)/$(CROSS_GCC_VERSION)/install-tools/mkheaders.conf endif @$(call touch) |