diff options
| -rw-r--r-- | RepositoryFixes.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index f056b8d439da..7fce10d14bb6 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -56,6 +56,7 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES)) # Libraries not provided by mingw(-w64), available only in the Windows # SDK. So if these actually are liked with somewhere, we can't 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)))) |