Backed out changeset: e84942bd0aca

5 files changed, 0 insertions, 88 deletions

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 5f9753a2a88f..6a88e48f232a 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -58,20 +58,6 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
 ))
 
 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,\
     kernel32 \
     msvcrt \
@@ -80,7 +66,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 85551407d335..d6f2c25a1763 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -55,30 +55,8 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-ifeq ($(HAVE_GETOPT),YES)
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
-    $$(CXXFLAGS) \
-    -DHAVE_GETOPT \
-))
-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 \
-))
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
     kernel32 \
     msvcrt \
     oldnames \
@@ -86,7 +64,6 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 1c0faf30b015..071f0c5bb7b0 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -51,20 +51,6 @@ $(eval $(call gb_Executable_add_exception_objects,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 \
-))
-else
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     kernel32 \
     msvcrt \
@@ -73,7 +59,6 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 637acf2afd0e..0c83b7137eea 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -56,20 +56,6 @@ $(eval $(call gb_Executable_add_exception_objects,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,\
     kernel32 \
     msvcrt \
@@ -78,7 +64,6 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index fe91657e42f4..dde1f8f5dd92 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -160,25 +160,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/win/source/dll/toolsdll \
 ))
 
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,tl,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    advapi32 \
-    kernel32 \
-    mpr \
-    msvcrt \
-    ole32 \
-    shell32 \
-    user32 \
-    uuid \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,tl,\
     advapi32 \
     kernel32 \
@@ -192,7 +173,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     uwinapi \
 ))
 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