summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2014-09-11 11:43:04 +0100
committerJosé Fonseca <jfonseca@vmware.com>2014-09-11 11:59:28 +0100
commit771ab951a8d3d16f577f0438a8d03544ff32b21f (patch)
treebe6209060c46a505fed5140bde9aec9ca730c364
parent4860e989723eb02507c1bf153e568ab05424575c (diff)
scons: add /dynamicbase and /nxcompat to MinGW linkflags
-rwxr-xr-xscons/gallium.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index b6c05ecd800..1dcfa6b243c 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -529,6 +529,10 @@ def generate(env):
else:
env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
if env['platform'] == 'windows':
+ linkflags += [
+ '-Wl,--nxcompat', # DEP
+ '-Wl,--dynamicbase', # ASLR
+ ]
# Avoid depending on gcc runtime DLLs
linkflags += ['-static-libgcc']
if 'w64' in env['CC'].split('-'):
@@ -547,8 +551,8 @@ def generate(env):
linkflags += [
'/fixed:no',
'/incremental:no',
- '/dynamicbase',
- '/nxcompat',
+ '/dynamicbase', # ASLR
+ '/nxcompat', # DEP
]
env.Append(LINKFLAGS = linkflags)
env.Append(SHLINKFLAGS = shlinkflags)