From af2d7af9983a04fa2dd6c073bdc41847a23012c8 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Mon, 15 Apr 2019 01:23:10 -0400
Subject: Per machine do 'build.' and '' option prefixes
See the docs/ changes for details.
---
mesonbuild/rewriter.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'mesonbuild/rewriter.py')
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py
index a6860d5..e700718 100644
--- a/mesonbuild/rewriter.py
+++ b/mesonbuild/rewriter.py
@@ -465,10 +465,13 @@ class Rewriter:
cdata = self.interpreter.coredata
options = {
**cdata.builtins,
+ **cdata.builtins_per_machine.host,
+ **{'build.' + k: o for k, o in cdata.builtins_per_machine.build.items()},
**cdata.backend_options,
**cdata.base_options,
- **cdata.compiler_options.build,
- **cdata.user_options
+ **cdata.compiler_options.host,
+ **{'build.' + k: o for k, o in cdata.compiler_options.build.items()},
+ **cdata.user_options,
}
for key, val in sorted(cmd['options'].items()):
--
cgit v1.1