odk/CustomTarget_unowinreg.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 328988babda60300fd854a116ceca742a4bd79ca
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Sat Dec 5 10:47:36 2020 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Thu Dec 10 15:25:09 2020 +0100
use -static-libgcc for unowinreg.dll
to fix
"
For another, at least the unowinreg.dll resulting from
--enable-build-unowinreg
on Fedora 33 would have had a dependency on libgcc_s_dw2-1.dll that would
generally not have been available in a target Windows environment.
"
mentioned in 01241113947fc7bd7f7b765dd897bb023c8ca99
Change-Id: Ib247c816f05de8c4ef20a939a86e780df5e40dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107253
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk
index 3a46ddfd6860..a847e1d6bb38 100644
--- a/odk/CustomTarget_unowinreg.mk
+++ b/odk/CustomTarget_unowinreg.mk
@@ -19,7 +19,7 @@ $(call
gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \
$(if $(filter FREEBSD,$(OS)),-I$(JAVA_HOME)/include/freebsd \
-I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\
$(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \
- -shared -o $@ $< \
+ -shared -static-libgcc -o $@ $< \
-Wl,--kill-at -lkernel32 -ladvapi32 && \
$(MINGWSTRIP) $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
