From 458067db24e3cfc0ffa37419d8ed659e0fb53c47 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 22 May 2010 15:59:46 +0100 Subject: cmcfixes75: #i111770# remove configure.in hacks and handle prelinked system-stdlibs properly and fix the so.1 -> so.2 for hppa and m68k --- external/gcc3_specific/makefile.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'external') 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 -- cgit v1.2.3 From 94b12d448ec2b5c026072fb4a4756edca289967b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 2 Jun 2010 12:08:17 +0100 Subject: cmcfixes75: #i111770# handle libgcc_s.so.1|2|4 in deliver --- external/prj/d.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'external') diff --git a/external/prj/d.lst b/external/prj/d.lst index 2c50c4c6f801..20b727cad60b 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -18,8 +18,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 -- cgit v1.2.3