summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2018-11-12 21:22:31 +0100
committerRichard Braun <rbraun@sceen.net>2018-11-12 21:22:31 +0100
commitadeff7f23f0786f74a21f007e10f924628c2d49b (patch)
treef27c751402a513ba30f2b46b17b1a02f2ae2e976
parentb433de1b2f3ea18721b1873760626f56ba80bbc5 (diff)
tools/build_configs.py: update compiler-related option names
Commit a18a9d0cc0232dc151cef3d2d61807182ef7f6ea renamed options related to the compiler, but the configuration checking script was not updated with the new names. Fix that now.
-rwxr-xr-xtools/build_configs.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/build_configs.py b/tools/build_configs.py
index c0fce99c..9f7db8e1 100755
--- a/tools/build_configs.py
+++ b/tools/build_configs.py
@@ -89,9 +89,9 @@ all_cc_options_dict = {
# option when building a configuration.
small_options_dict = {
- 'CONFIG_CC_EXE' : ['gcc', 'clang'],
+ 'CONFIG_COMPILER' : ['gcc', 'clang'],
'CONFIG_64BITS' : ['y', 'n'],
- 'CONFIG_CC_OPTIONS' : gen_cc_options_list(all_cc_options_dict),
+ 'CONFIG_COMPILER_OPTIONS' : gen_cc_options_list(all_cc_options_dict),
'CONFIG_SMP' : ['y', 'n'],
'CONFIG_MAX_CPUS' : ['1', '128'],
'CONFIG_ASSERT' : ['y', 'n'],
@@ -147,20 +147,20 @@ passing_filters_list += gen_exclusive_boolean_filters_list(test_list,
blocking_filters_list = [
# XXX Clang currently cannot build the kernel with LTO.
{
- 'CONFIG_CC_EXE' : [True, 'clang'],
- 'CONFIG_CC_OPTIONS' : [True, re.compile('-flto')],
+ 'CONFIG_COMPILER' : [True, 'clang'],
+ 'CONFIG_COMPILER_OPTIONS' : [True, re.compile('-flto')],
},
{
- 'CONFIG_SMP' : [True, 'y'],
- 'CONFIG_MAX_CPUS' : [True, '1'],
+ 'CONFIG_SMP' : [True, 'y'],
+ 'CONFIG_MAX_CPUS' : [True, '1'],
},
{
- 'CONFIG_SMP' : [True, 'n'],
- 'CONFIG_MAX_CPUS' : [False, '1'],
+ 'CONFIG_SMP' : [True, 'n'],
+ 'CONFIG_MAX_CPUS' : [False, '1'],
},
{
- 'CONFIG_64BITS' : [True, 'y'],
- 'CONFIG_X86_PAE' : [True, 'y'],
+ 'CONFIG_64BITS' : [True, 'y'],
+ 'CONFIG_X86_PAE' : [True, 'y'],
},
]