Mesa (master): scons: do not include headers from the sources lists

Emil Velikov evelikov at kemper.freedesktop.org
Thu Aug 14 14:47:11 UTC 2014


Module: Mesa
Branch: master
Commit: d4a1f3fd270001b2fb0684dc981340391df8fb64
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4a1f3fd270001b2fb0684dc981340391df8fb64

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Wed Aug 13 20:33:35 2014 +0100

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 at freedesktop.org>
Acked-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 scons/custom.py |    3 +++
 1 file changed, 3 insertions(+)

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




More information about the mesa-commit mailing list