diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 4eadee362148..ec23efc08df7 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -232,7 +232,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \
 			-pdb:$(call gb_LinkTarget__get_pdb_filename,$(WORKDIR)/LinkTarget/$(2))) \
 		$(if $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1)) \
-		$(call gb_filter_link_output); RC=$$?; rm $${RESPONSEFILE} \
+		| LC_ALL=C $(GBUILDDIR)/platform/filter-creatingLibrary.awk; RC=$${PIPESTATUS[0]}; rm $${RESPONSEFILE} \
 	$(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then rm -f $(1); exit 42; fi) \
 	$(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \
 	$(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;1 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest; fi) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 9c0425c7efec..8ba47447df32 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -279,10 +279,6 @@ define gb_create_deps
 endef
 endif
 
-define gb_filter_link_output
-| LC_ALL=C $(GBUILDDIR)/platform/filter-creatingLibrary.awk; exit $${PIPESTATUS[0]}
-endef
-
 gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
 # When compiling for CLR, disable "warning C4339: use of undefined type detected
diff --git a/solenv/gbuild/platform/filter-creatingLibrary.awk b/solenv/gbuild/platform/filter-creatingLibrary.awk
index 943ba64179e3..5b3335ce8724 100755
--- a/solenv/gbuild/platform/filter-creatingLibrary.awk
+++ b/solenv/gbuild/platform/filter-creatingLibrary.awk
@@ -14,13 +14,13 @@
 BEGIN {
     creatinglibrary_prefix = ENVIRON["CREATINGLIBRARY_PREFIX"];
     if (!creatinglibrary_prefix) {
-        creatinglibrary_prefix = "   Creating library "
+        creatinglibrary_prefix = "\\.lib.*\\.exp"
     }
     firstline = 1
 }
 
 {
-    if (firstline && index($0, creatinglibrary_prefix) == 1) {
+    if (firstline && match($0, creatinglibrary_prefix)) {
         # ignore
     } else {
         # because MSVC stupidly prints errors on stdout, it's