diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 20:53:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 23:56:19 +0200 |
| commit | 6de75d132fe44a6f3e6160fec0c2e5e32ed023d3 (patch) | |
| tree | fb7239e88f8a9cd67f5710f39b44c39af57f91ed /onlineupdate/Executable_mar.mk | |
| parent | 2539702ff5e7bf6bc5dbdb3f8301196487b9266b (diff) | |
updater: get the signature verification working on Windows
The updater itself does not link to NSS on Windows and instead uses the
Windows-internal crypto libraries. However the mar executable needs to
link against NSS, so we need to split the code a bit.
Change-Id: Iea61c716aa507a876fdb444eb28ad828bdea18bd
Reviewed-on: https://gerrit.libreoffice.org/40608
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'onlineupdate/Executable_mar.mk')
| -rw-r--r-- | onlineupdate/Executable_mar.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk index 3711809b1885..2c8adc47c15d 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -18,13 +18,9 @@ $(eval $(call gb_Executable_set_include,mar,\ $(eval $(call gb_Executable_use_static_libraries,mar,\ libmar \ + libmarverify \ )) -$(eval $(call gb_Executable_use_externals,mar,\ - nss3 \ -)) - - ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,mar,\ ws2_32.lib \ @@ -32,9 +28,13 @@ $(eval $(call gb_Executable_add_libs,mar,\ )) endif +$(eval $(call gb_Executable_use_externals,mar,\ + nss3 \ +)) + $(eval $(call gb_Executable_add_defs,mar,\ - -DMAR_NSS \ -DUNICODE \ + -DMAR_NSS \ )) $(eval $(call gb_Executable_add_defs,mar,\ |