glsl: add missing null check in tfeedback_decl::init()

[mesa.git] / scons / gallium.py

diff --git a/scons/gallium.py b/scons/gallium.py
index e9153197110c318d1adaaa3e77ec048fb15ae779..1dcfa6b243c2ff96cb19bc93241cc640d405525e 100755 (executable)
--- 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,6 +551,8 @@ def generate(env):
         linkflags += [
             '/fixed:no',
             '/incremental:no',
+            '/dynamicbase', # ASLR
+            '/nxcompat', # DEP
         ]
     env.Append(LINKFLAGS = linkflags)
     env.Append(SHLINKFLAGS = shlinkflags)