summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-02-23 17:21:36 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-02-23 17:21:36 +0000
commit37f21fce3bd323c361291215edeb7d8cf5f4335b (patch)
tree2909c90da7bff47ba359d50bde242b79a632210b /scons
parent7399d56ec6019e00297eef57f802a53698baa8ad (diff)
parent60e35ebf1476c31eb5d7c207ab8e9db77fcad896 (diff)
Merge commit 'origin/gallium-0.1'
Conflicts: src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c src/gallium/auxiliary/util/u_tile.c
Diffstat (limited to 'scons')
-rw-r--r--scons/gallium.py2
-rw-r--r--scons/generic.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index d20d02ca20..ee22110311 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -473,7 +473,7 @@ def generate(env):
'/entry:DrvEnableDriver',
]
- if env['profile']:
+ if env['debug'] or env['profile']:
linkflags += [
'/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
]
diff --git a/scons/generic.py b/scons/generic.py
index 7592222fd6..def2e415d5 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -552,7 +552,7 @@ def generate(env):
'/entry:DrvEnableDriver',
]
- if env['profile']:
+ if env['debug'] or env['profile']:
linkflags += [
'/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
]