configuration.skipCategories += test_categories.validate(
args.skipCategories, False)
- cflags_extras = ""
if args.E:
- cflags_extras += args.E
+ os.environ['CFLAGS_EXTRAS'] = args.E
if args.dwarf_version:
configuration.dwarf_version = args.dwarf_version
- cflags_extras += '-gdwarf-{}'.format(args.dwarf_version)
-
- os.environ['CFLAGS_EXTRAS'] = cflags_extras
+ # We cannot modify CFLAGS_EXTRAS because they're used in test cases
+ # that explicitly require no debug info.
+ os.environ['CFLAGS'] = '-gdwarf-{}'.format(configuration.dwarf_version)
if args.d:
sys.stdout.write(
pattern = '%s="%s"' if "win32" in sys.platform else "%s='%s'"
def setOrAppendVariable(k, v):
- append_vars = ["CFLAGS_EXTRAS", "LD_EXTRAS"]
+ append_vars = ["CFLAGS", "CFLAGS_EXTRAS", "LD_EXTRAS"]
if k in append_vars and k in os.environ:
v = os.environ[k] + " " + v
return pattern % (k, v)