diff options
| -rw-r--r-- | scons/gallium.py | 8 | ||||
| -rw-r--r-- | scons/generic.py | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index fc1ed08e478..3fbac760fdb 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -347,6 +347,7 @@ def generate(env): '/Od', # disable optimizations '/Oi', # enable intrinsic functions '/Oy-', # disable frame pointer omission + '/GL-', # disable whole program optimization ] else: cflags += [ @@ -437,10 +438,15 @@ def generate(env): linkflags += ['-m32'] if env['machine'] == 'x86_64': linkflags += ['-m64'] - if platform == 'winddk': + if platform == 'windows': # See also: # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx linkflags += [ + '/fixed:no', + '/incremental:no', + ] + if platform == 'winddk': + linkflags += [ '/merge:_PAGE=PAGE', '/merge:_TEXT=.text', '/section:INIT,d', diff --git a/scons/generic.py b/scons/generic.py index 23231966731..31a4a795940 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -425,6 +425,7 @@ def generate(env): '/Od', # disable optimizations '/Oi', # enable intrinsic functions '/Oy-', # disable frame pointer omission + '/GL-', # disable whole program optimization ] else: ccflags += [ @@ -516,10 +517,15 @@ def generate(env): linkflags += ['-m32'] if env['machine'] == 'x86_64': linkflags += ['-m64'] - if platform == 'winddk': + if platform == 'windows': # See also: # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx linkflags += [ + '/fixed:no', + '/incremental:no', + ] + if platform == 'winddk': + linkflags += [ '/merge:_PAGE=PAGE', '/merge:_TEXT=.text', '/section:INIT,d', |