summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2014-08-13 20:33:35 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-14 15:38:04 +0100
commitd4a1f3fd270001b2fb0684dc981340391df8fb64 (patch)
tree49365aa2ff79723365320d6bd1bb0bbc24b2f971 /scons
parent395ce0b0fa0725ebfb4375beff4cdbb4df6fb4a2 (diff)
downloadexternal_mesa3d-d4a1f3fd270001b2fb0684dc981340391df8fb64.zip
external_mesa3d-d4a1f3fd270001b2fb0684dc981340391df8fb64.tar.gz
external_mesa3d-d4a1f3fd270001b2fb0684dc981340391df8fb64.tar.bz2
scons: do not include headers from the sources lists
The SCons documentation is not explicit on the topic yet building mesa with SCons and MSVC is known to have problems when headers are listed. So be safe just drop them for now. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82534 Tested-by: Vinson Lee <vlee@freedesktop.org> Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'scons')
-rw-r--r--scons/custom.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/scons/custom.py b/scons/custom.py
index 09c937e..043793b 100644
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -276,6 +276,9 @@ def parse_source_list(env, filename, names=None):
# Prefer relative source paths, as absolute files tend to
# cause duplicate actions.
f = f[len(cur_srcdir + '/'):]
+ # do not include any headers
+ if f.endswith('.h'):
+ continue
srcs.append(f)
src_lists[sym] = srcs