diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 18:29:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 20:39:02 +0300 |
| commit | 26e9dfea9abee8a53eefcc42a648c06fcff19d49 (patch) | |
| tree | 7b4005faec5d8959c9a6c01df8c28e97d4fc14dc /solenv | |
| parent | 268cfa5cf4b4aa75daf79a0e3019f37e37746509 (diff) | |
I don't think we need to explicitly link with libstdc++ and libgcc
Surely these are linked to by default anyway? Is this just old cruft,
or specific to OOo's use of MinGW on Cygwin, and not needed with a
modern mingw-w64 cross-compiler? Let's see...
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 24 | ||||
| -rw-r--r-- | solenv/inc/wntgcci.mk | 4 |
2 files changed, 0 insertions, 28 deletions
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 8c056393c16f..3286d5e2b610 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -44,26 +44,6 @@ gb_AWK := awk gb_CLASSPATHSEP := : gb_YACC := bison gb_RC := $(WINDRES) -ifeq ($(MINGW_SHARED_GXXLIB),YES) -gb_MINGW_LIBSTDCPP := $(subst -l,,$(MINGW_SHARED_LIBSTDCPP)) -else -gb_MINGW_LIBSTDCPP := \ - stdc++ \ - moldname -endif -ifeq ($(MINGW_SHARED_GCCLIB),YES) -gb_MINGW_LIBGCC := \ - gcc_s \ - gcc -else -ifeq ($(MINGW_GCCLIB_EH),YES) -gb_MINGW_LIBGCC := \ - gcc \ - gcc_eh -else -gb_MINGW_LIBGCC := gcc -endif -endif gb_OSDEFS := \ -DWINVER=0x0500 \ @@ -160,9 +140,7 @@ gb_COMPILERNOOPTFLAGS := -O0 gb_STDLIBS := \ mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ mingw32 \ - $(gb_MINGW_LIBGCC) \ uwinapi \ mingwex \ @@ -476,8 +454,6 @@ gb_Library_PLAINLIBS_NONE += \ mingwthrd \ mingw32 \ mingwex \ - $(gb_MINGW_LIBSTDCPP) \ - $(gb_MINGW_LIBGCC) \ advapi32 \ crypt32 \ d3d9 \ diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 38fa79c8125b..24b7e4e058c8 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -118,11 +118,7 @@ LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= -.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" -STDLIBCPP=$(MINGW_SHARED_LIBSTDCPP) -.ELSE STDLIBCPP=-lstdc++ -.ENDIF UWINAPILIB*=$(DYNAMIC) -luwinapi .IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" |