diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-06-08 09:04:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-06-14 08:05:25 +0200 |
| commit | 737a7d654a0fdbaeba1fdfe02c8c1e78ba1fb636 (patch) | |
| tree | ad03ba0e78aaf6ca3bfb978be095c3cb35dd2dbb /rules | |
| parent | f3dd19b312faa76943acc2b22c29d1f0dc6a3f40 (diff) | |
| download | OSELAS.Toolchain-737a7d654a0fdbaeba1fdfe02c8c1e78ba1fb636.tar.gz OSELAS.Toolchain-737a7d654a0fdbaeba1fdfe02c8c1e78ba1fb636.tar.xz | |
cross-binutils: adapt to gcc lib64 changes
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/cross-binutils.make | 8 | ||||
| -rw-r--r-- | rules/cross-gcc.make | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/rules/cross-binutils.make b/rules/cross-binutils.make index be043f3..5841dbd 100644 --- a/rules/cross-binutils.make +++ b/rules/cross-binutils.make @@ -38,6 +38,12 @@ CROSS_BINUTILS_CONF_ENV := \ CFLAGS="-ggdb3 -O2" \ CXXFLAGS="-ggdb3 -O2" +ifneq ($(PTXCONF_ARCH_ARM64)$(PTXCONF_ARCH_X86_64)$(PTXCONF_ARCH_MIPS64),) +CROSS_BINUTILS_LIBDIR := lib64 +else +CROSS_BINUTILS_LIBDIR := lib +endif + # # autoconf # @@ -45,7 +51,7 @@ CROSS_BINUTILS_CONF_TOOL := autoconf CROSS_BINUTILS_CONF_OPT := \ $(PTX_HOST_CROSS_AUTOCONF) \ $(PTXCONF_TOOLCHAIN_CONFIG_SYSROOT) \ - --with-lib-path="=/../$(PTX_TOUPLE_TARGET)/lib:=/lib:=/usr/lib" \ + --with-lib-path="=/../$(PTX_TOUPLE_TARGET)/$(CROSS_BINUTILS_LIBDIR):=/$(CROSS_BINUTILS_LIBDIR):=/usr/$(CROSS_BINUTILS_LIBDIR)" \ \ --enable-gold \ --enable-ld=default \ diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 5758326..5643dc8 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -164,6 +164,10 @@ CROSS_GCC_MAKE_OPT := \ $(STATEDIR)/cross-gcc.install: $(STATEDIR)/cross-gcc.report @$(call targetinfo) @$(call world/install, CROSS_GCC) +ifdef PTXCONF_CROSS_GCC_LANG_CXX + @test -e $(CROSS_GCC_PKGDIR)$(PTXCONF_PREFIX_CROSS)/$(PTXCONF_GNU_TARGET)/$(CROSS_BINUTILS_LIBDIR)/libstdc++.so.6 || \ + ptxd_bailout "CROSS_BINUTILS_LIBDIR incorrect!" +endif @$(call world/env, CROSS_GCC) \ pkg_license_target=gcclibs \ |