summaryrefslogtreecommitdiff
path: root/solenv/gbuild/platform/winmingw.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/platform/winmingw.mk')
-rw-r--r--solenv/gbuild/platform/winmingw.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 5d3879ee2a10..c72bb033ec2c 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -424,7 +424,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
- $(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib)))) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
-Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \
-o $(1)))
endef
@@ -440,7 +440,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
- $(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib)))) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
-Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
-Wl$(COMMA)--out-implib$(COMMA)$(1) \
-o $(dir $(1))/$(notdir $(DLLTARGET))))