aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mintro.py
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2018-12-12 00:19:03 -0500
committerJohn Ericson <git@JohnEricson.me>2019-02-02 13:59:14 -0500
commit19f81d3e33c70c9c902dabaad732e5d33bf05bd4 (patch)
treef86664395d7233bbba9e3c129c81c7056c6fa98b /mesonbuild/mintro.py
parent6dbe33d949237411b1291c30f5383885befb3554 (diff)
downloadmeson-19f81d3e33c70c9c902dabaad732e5d33bf05bd4.zip
meson-19f81d3e33c70c9c902dabaad732e5d33bf05bd4.tar.gz
meson-19f81d3e33c70c9c902dabaad732e5d33bf05bd4.tar.bz2
Never access environment.properties downstream
Instead use coredata.compiler_options.<machine>. This brings the cross and native code paths closer together, since both now use that. Command line options are interpreted just as before, for backwards compatibility. This does introduce some funny conditionals. In the future, I'd like to change the interpretation of command line options so - The logic is cross-agnostic, i.e. there are no conditions affected by `is_cross_build()`. - Compiler args for both the build and host machines can always be controlled by the command line. - Compiler args for both machines can always be controlled separately.
Diffstat (limited to 'mesonbuild/mintro.py')
-rw-r--r--mesonbuild/mintro.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index 074c70a..5eecb67 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -204,7 +204,8 @@ def list_buildoptions(coredata: cdata.CoreData):
add_keys(optlist, core_options, 'core')
add_keys(optlist, coredata.backend_options, 'backend')
add_keys(optlist, coredata.base_options, 'base')
- add_keys(optlist, coredata.compiler_options, 'compiler')
+ # TODO others
+ add_keys(optlist, coredata.compiler_options.build, 'compiler')
add_keys(optlist, dir_options, 'directory')
add_keys(optlist, coredata.user_options, 'user')
add_keys(optlist, test_options, 'test')