diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 19:56:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 19:58:55 +0200 |
| commit | 3679bdb27c6c0a73a01c2b27485b503033517f53 (patch) | |
| tree | 07520e106f87eec6f95051f93921c453f0d10f36 | |
| parent | 5bbd319a592b9926559070a241d8ddac26a67d14 (diff) | |
use libstdcxx version, needs fix for other gcc versions
| -rw-r--r-- | toolchain/gcc/Makefile | 8 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index e42256ff2..8a1661fb1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -258,7 +258,9 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \ done; (cd $(TOOLCHAIN_DIR)/usr/bin && \ - ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION}) + ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION} && \ + ln -sf $(GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++-${PKG_VERSION} \ + ) ifeq ($(ADK_TARGET_USE_GOLD),y) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) @@ -267,8 +269,8 @@ else ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) endif cd $(STAGING_TARGET_DIR)/lib && \ - ln -sf libstdc++.so.6.0.19 libstdc++.so && \ - ln -sf libstdc++.so.6.0.19 libstdc++.so.6 + ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so && \ + ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so.6 # cleanup unneeded docs rm -rf $(TOOLCHAIN_DIR)/usr/share # create gcc wrapper for uClinux/m68k diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 7e50a0c54..5c597c718 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -8,6 +8,7 @@ PKG_MD5SUM:= b188a3c9be25ddbf36b4fa6f04aaafaa PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 19 endif ifeq ($(ADK_TOOLCHAIN_GCC_4_8_3),y) PKG_VERSION:= 4.8.3 @@ -15,6 +16,7 @@ PKG_MD5SUM:= e2c60f5ef918be2db08df96c7d97d0c4 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 19 endif ifeq ($(ADK_TOOLCHAIN_GCC_4_5_4),y) PKG_VERSION:= 4.5.4 @@ -22,4 +24,5 @@ PKG_MD5SUM:= e2c60f5ef918be2db08df96c7d97d0c4 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 19 endif |