diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
| commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
| tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /toolchain/gcc | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index d29778c2e..bbbd3d09c 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -199,12 +199,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 $@ |