summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:10:27 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:10:27 +0100
commitb8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (patch)
treee669bfee978a3538becbe7933c6c243590e13aad /toolchain
parent9e32d91c27e484f868d263cb757c56df50ebdb66 (diff)
parentc40e92f7cfbf6095abcb97fdfd6e7ce33579022c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 4b0212f77..4eba65b87 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -208,12 +208,16 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
# fix linking g++ apps with libtool
@-test -d $(STAGING_TARGET_DIR)/lib32 && \
cd $(STAGING_TARGET_DIR)/lib32 && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so.6
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
+ @-test -d $(STAGING_TARGET_DIR)/libx32 && \
+ cd $(STAGING_TARGET_DIR)/libx32 && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
@-test -d $(STAGING_TARGET_DIR)/lib64 && \
cd $(STAGING_TARGET_DIR)/lib64 && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so.6
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
# cleanup unneeded docs
rm -rf $(STAGING_HOST_DIR)/share
touch $@