diff options
| author | Rene Engelhard <rene@debian.org> | 2020-12-05 10:47:36 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-12-11 12:32:22 +0100 |
| commit | a9d8d1ab16f8bead44b3383b0315e32f86a82e08 (patch) | |
| tree | dd7429a9c0c5d698c420f6577646f88ee7483677 /odk | |
| parent | negative return passed to parameter that cannot be negative (diff) | |
| download | core-a9d8d1ab16f8bead44b3383b0315e32f86a82e08.tar.gz core-a9d8d1ab16f8bead44b3383b0315e32f86a82e08.zip | |
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.stahl@cib.de>
(cherry picked from commit 328988babda60300fd854a116ceca742a4bd79ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107538
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_unowinreg.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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) $@ |