[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/com_MSC_class.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90f1421d014543d9d78124cb406cb006102b0bd8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 8 12:33:55 2018 +0100

    gbuild: MSVC: invoke MSASM with /safeseh
    
    BinScope complains that the sblo.dll lacks SAFESEH flag.
    
    Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2
    (cherry picked from commit e8f2ca76037eed4c10c9851682c7f6856c7fb0de)
    Reviewed-on: https://gerrit.libreoffice.org/47585
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 0916c2fd1fd9..27a0aec80c4b 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -95,7 +95,7 @@ define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	"$(ML_EXE)" /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
+	"$(ML_EXE)" /safeseh /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
 	echo "$(1) : $(3)" > $(4)
 endef