summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-22 15:46:16 +0200
committerobo <obo@openoffice.org>2010-06-22 15:46:16 +0200
commitbaff42dc3fb81afc295133e4bf0122b7e1fa267c (patch)
treed5a4b272163a2d0972b3190bb6a69d980461177f /external
parent9f5fbeb43aaa16d9418c28e1976b5c4b6176f8c9 (diff)
parent02456c0301d82d803d462a707225c889382077f4 (diff)
CWS-TOOLING: integrate CWS cmcfixes75
Diffstat (limited to 'external')
-rw-r--r--external/gcc3_specific/makefile.mk8
-rw-r--r--external/prj/d.lst4
2 files changed, 6 insertions, 6 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 4ad02335c8ea..23940c30f8d1 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -47,14 +47,14 @@ $(MINGWGXXDLL) :
.EXPORT : CC
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
- $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
+ $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
-$(LB)$/libgcc_s.so.1 :
- $(GCCINSTLIB) libgcc_s.so.1 $(LB)
+$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
+ $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
.ENDIF
.ENDIF
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 5153d4ace421..9e0c68129c77 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -20,8 +20,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
-..\%__SRC%\lib\libstdc++.so.6 %_DEST%\lib%_EXT%\libstdc++.so.6
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll