From 4cd76f2bd8615c8d7e74d2c1196b4890ac9973ea Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 5 Sep 2019 09:43:08 +1000 Subject: waf: Do not filter flags to be unique using set() Filtering the flags to be unique using `set()` changes the order and this results in waf thinking the flags have changed rebuilding various pieces of code. --- rtemstoolkit/wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript index d9f01b9..bd7254b 100644 --- a/rtemstoolkit/wscript +++ b/rtemstoolkit/wscript @@ -74,8 +74,8 @@ def build(bld): # conf['warningflags'] = ['-Wall', '-Wextra', '-pedantic'] conf['optflags'] = bld.env.C_OPTS - conf['cflags'] = list(set(['-pipe', '-g'] + conf['optflags'])) - conf['cxxflags'] = list(set(['-pipe', '-g', '-std=c++11'] + conf['optflags'])) + conf['cflags'] = ['-pipe', '-g'] + conf['optflags'] + conf['cxxflags'] = ['-pipe', '-g', '-std=c++11'] + conf['optflags'] conf['linkflags'] = ['-g'] # @@ -208,7 +208,7 @@ def bld_elftoolchain(bld, conf): bld.stlib(target = 'elf', features = 'c', install_path = None, - uses = ['native-elf-format'], + use = ['native-elf-format'], includes = [bld.bldnode.abspath(), 'elftoolchain/libelf', 'elftoolchain/common'] + includes, cflags = conf['cflags'], -- cgit v1.2.3