From efb12030a1179dfd567f6c1b737a49291eebe19d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 25 Nov 2020 16:50:59 +0100 Subject: Upgrade to waf 2.0.21 --- Tools/c_config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Tools/c_config.py') diff --git a/Tools/c_config.py b/Tools/c_config.py index 537af03..03b6bf6 100644 --- a/Tools/c_config.py +++ b/Tools/c_config.py @@ -68,6 +68,7 @@ MACRO_TO_DEST_CPU = { '__s390__' : 's390', '__sh__' : 'sh', '__xtensa__' : 'xtensa', +'__e2k__' : 'e2k', } @conf @@ -150,7 +151,7 @@ def parse_flags(self, line, uselib_store, env=None, force_static=False, posix=No elif x.startswith('-std='): prefix = 'CXXFLAGS' if '++' in x else 'CFLAGS' app(prefix, x) - elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie'): + elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie', '-flto', '-fno-lto'): app('CFLAGS', x) app('CXXFLAGS', x) app('LINKFLAGS', x) @@ -1282,10 +1283,11 @@ def multicheck(self, *k, **kw): tasks = [] id_to_task = {} - for dct in k: + for counter, dct in enumerate(k): x = Task.classes['cfgtask'](bld=bld, env=None) tasks.append(x) x.args = dct + x.args['multicheck_counter'] = counter x.bld = bld x.conf = self x.args = dct -- cgit v1.2.1