[Libreoffice-commits] core.git: solenv/gbuild

[Fridrich Å trba]

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

New commits:
commit 8102d3f91699a9a576b5ceacb62906e9d6dd807c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 3 10:53:32 2013 +0200

    exclude the -safeseh from 64-bit windows
    
    Change-Id: I341a7c3bdd00de5e4f3e097c32fb05cff62b10b7

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index a93a130..e8c30bf 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -236,7 +236,7 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
 	-opt:noref \
 	-incremental:no \
 	-debug \
-	-safeseh \
+	$(if $(filter NO,$(LIBRARY_X64)), -safeseh) \
 	-nxcompat \
 	-dynamicbase \
 	-manifest