CWS gnumake3: clean up mingw stuff after adding STDLIBS

5 files changed, 3 insertions, 93 deletions

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 18a23bb9bcf5..60c6e676057e 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -58,25 +58,4 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
     tools/bootstrp/prj \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    oldnames \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 31a823a2a207..abde9af09dfa 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -64,21 +64,7 @@ $(eval $(call gb_Executable_set_cxxflags,rscdep,\
 ))
 endif
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
     gnu_getopt \
-    oldnames \
 ))
 endif
 endif
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 491a2a958514..32b95bedd6da 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -51,21 +51,4 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\
     tools/bootstrp/so_checksum \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index c086cc5160a1..ab8379bae5bd 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -56,25 +56,4 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\
     tools/bootstrp/sspretty \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    oldnames \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 8489f21d7d47..4e676f2c3436 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -141,6 +141,7 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\
 endif
 
 ifeq ($(OS),WNT)
+
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \
     -I$(SRCDIR)/tools/win/inc \
@@ -150,34 +151,16 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/win/source/dll/toolsdll \
 ))
 
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,tl,\
-    uwinapi \
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    moldname \
-    mingwex \
-    kernel32 \
-    mpr \
-    msvcrt \
-    ole32 \
-    shell32 \
-    user32 \
-    uuid \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,tl,\
     mpr \
-    oldnames \
     ole32 \
     shell32 \
     user32 \
     uuid \
 ))
+
 endif
-endif
+
 # tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
 # -DOPTIMIZE
 # no -DTOOLS_DLLIMPLEMENTATION on toolsdll