fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 14:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

scons: Fix MinGW cross compilation.

Browse source 
Compensate for the recent changes and assumptions added to
Makefiles.sources
This commit is contained in:
José Fonseca 2012-08-15 19:24:58 +01:00
parent 5f82d19248
commit 50dec63790
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
scons/custom.py
View file

@ -236,8 +236,13 @@ def parse_source_list(env, filename, names=None):
parser = source_list.SourceListParser() parser = source_list.SourceListParser()
src = env.File(filename).srcnode() src = env.File(filename).srcnode()
parser.add_symbol('top_srcdir', env.Dir('#').abspath) cur_srcdir = env.Dir('.').srcnode().abspath
parser.add_symbol('top_builddir', env['build_dir']) top_srcdir = env.Dir('#').abspath
top_builddir = os.path.join(top_srcdir, env['build_dir'])
# Populate the symbol table of the Makefile parser.
parser.add_symbol('top_srcdir', top_srcdir)
parser.add_symbol('top_builddir', top_builddir)
sym_table = parser.parse(src.abspath) sym_table = parser.parse(src.abspath)
@ -253,7 +258,21 @@ def parse_source_list(env, filename, names=None):
src_lists = {} src_lists = {}
for sym in symbols: for sym in symbols:
val = sym_table[sym] val = sym_table[sym]
src_lists[sym] = [f for f in val.split(' ') if f] srcs = []
for f in val.split():
if f:
# Process source paths
if f.startswith(top_builddir + '/src'):
# Automake puts build output on a `src` subdirectory, bue
# SCons does no, so strip it here.
f = top_builddir + f[len(top_builddir + '/src'):]
if f.startswith(cur_srcdir + '/'):
# Prefer relative source paths, as absolute files tend to
# cause duplicate actions.
f = f[len(cur_srcdir + '/'):]
srcs.append(f)
src_lists[sym] = srcs
# if names are given, concatenate the lists # if names are given, concatenate the lists
if names: if names: