scons: Put all config variables in an env['CONF'] sub-dict.

This makes what are configuration and what are internal SCons variables
explicit and separate, and makes it unnecessary to call out what
variables to export to C++.

These variables will also be plumbed into and out of kconfiglib in later
changes.

Change-Id: Iaf5e098d7404af06285c421dbdf8ef4171b3f001
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56892
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2022-02-15 22:23:43 -08:00
parent caa5f12e21
commit e6c0ba97db
87 changed files with 211 additions and 233 deletions

View File

@@ -44,7 +44,7 @@ SimObject('Ethernet.py', sim_objects=[
'EtherLink', 'DistEtherLink', 'EtherBus', 'EtherSwitch', 'EtherTapBase',
'EtherTapStub', 'EtherDump', 'EtherDevice', 'IGbE', 'EtherDevBase',
'NSGigE', 'Sinic'] +
(['EtherTap'] if env['HAVE_TUNTAP'] else []))
(['EtherTap'] if env['CONF']['HAVE_TUNTAP'] else []))
# Basic Ethernet infrastructure
Source('etherbus.cc')

View File

@@ -29,9 +29,7 @@ import gem5_scons
with gem5_scons.Configure(main) as conf:
# Check if the TUN/TAP driver is available.
conf.env['HAVE_TUNTAP'] = conf.CheckHeader('linux/if_tun.h', '<>')
conf.env['CONF']['HAVE_TUNTAP'] = conf.CheckHeader('linux/if_tun.h', '<>')
if not main['HAVE_TUNTAP']:
if not main['CONF']['HAVE_TUNTAP']:
print("Info: Compatible header file <linux/if_tun.h> not found.")
export_vars.append('HAVE_TUNTAP')