summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-02-04 16:15:02 +0000
committerHerbert Dürr <hdu@apache.org>2013-02-04 16:15:02 +0000
commit96bc6d61062ac472145bb98d3eef77f45b939084 (patch)
tree9c12abc4fd42838ef161d4ac8a589f23f33f3995 /solenv
parent6746e3ace000264274e9f587f7223906a864c27c (diff)
fix linker complaints about invalid security options for StaticLib targets
Notes
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/windows.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5e50c3d5738c..4e72dd92dfd7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -190,11 +190,7 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
- -OPT:NOREF \
-SUBSYSTEM:CONSOLE \
- -safeseh \
- -nxcompat \
- -dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
ifneq ($(ENABLE_CRASHDUMP),)
@@ -438,7 +434,7 @@ endef
# Library class
gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_TARGETTYPEFLAGS := -DLL -OPT:NOREF -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Library_get_rpath :=
gb_Library_SYSPRE := i
@@ -588,7 +584,7 @@ endef
# Executable class
gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Executable_get_rpath :=
define gb_Executable_Executable_platform