diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-07 18:15:00 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 11:34:00 +0200 |
| commit | 7cb199ebc41068bf1c06b4885776659c18361bfb (patch) | |
| tree | 0a24a216116b7ae16d2330632175de5e37bdac89 /rules | |
| parent | d6acd2f213895ed386ffaacf89d2399402e7b59b (diff) | |
| download | OSELAS.Toolchain-7cb199ebc41068bf1c06b4885776659c18361bfb.tar.gz OSELAS.Toolchain-7cb199ebc41068bf1c06b4885776659c18361bfb.tar.xz | |
cross-gcc: remove more absolute paths from the final installation
It seems, in some places the paths with all symlinks resolved is used as
well, so replace it as well.
And replace the path added in a header file.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/cross-gcc.make | 4 | ||||
| -rw-r--r-- | rules/pre/toolchain.make | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 8dc77fd..3ba19a7 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -145,7 +145,8 @@ CROSS_GCC_CONF_OPT := \ $(STATEDIR)/cross-gcc.prepare: @$(call targetinfo) @$(call world/prepare, CROSS_GCC) - sed -i -e '/TOPLEVEL_CONFIGURE_ARGUMENTS/s;$(PTXDIST_WORKSPACE);WORKSPACE;g' \ + sed -i -e '/TOPLEVEL_CONFIGURE_ARGUMENTS/s;$(PTXDIST_WORKSPACE);$(PTXCONF_PROJECT);g' \ + -e '/TOPLEVEL_CONFIGURE_ARGUMENTS/s;$(call ptx/sh, realpath $(PTXDIST_WORKSPACE));$(PTXCONF_PROJECT);g' \ $(CROSS_GCC_BUILDDIR)/Makefile @$(call touch) @@ -172,6 +173,7 @@ $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report ifneq ($(call remove_quotes,$(PTXDIST_SYSROOT_CROSS)),) sed -i -e 's;$(call remove_quotes,$(PTXDIST_SYSROOT_CROSS));;' \ $(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/lib/gcc/$(PTXCONF_GNU_TARGET)/$(CROSS_GCC_VERSION)/install-tools/mkheaders.conf + $(wildcard $(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/lib/gcc/$(PTXCONF_GNU_TARGET)/$(CROSS_GCC_VERSION)/include-fixed/bits/statx.h) endif @$(call touch) diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make index 88704b0..73cbc42 100644 --- a/rules/pre/toolchain.make +++ b/rules/pre/toolchain.make @@ -49,8 +49,10 @@ PTXDIST_HOST_LDFLAGS := -L${PTXDIST_PATH_SYSROOT_HOST_PREFIX}/lib ifndef PTXCONF_TOOLCHAIN_DEBUG TOOLCHAIN_CROSS_DEBUG_MAP := \ - $(call remove_quotes,$(PTXDIST_SYSROOT_CROSS))= \ - $(PTXDIST_WORKSPACE)/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- + $(PTXDIST_SYSROOT_CROSS)= \ + $(call ptx/sh, realpath $(PTXDIST_SYSROOT_CROSS))= \ + $(PTXDIST_WORKSPACE)/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- \ + $(call ptx/sh, realpath $(PTXDIST_WORKSPACE))/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- TOOLCHAIN_CROSS_DEBUG_MAP_FLAGS := \ $(addprefix -fdebug-prefix-map=,$(TOOLCHAIN_CROSS_DEBUG_MAP)) |