From e17365cb6d1af6ae12fdaaf97f28a02c7ee61bed Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Mon, 7 Aug 2023 15:14:46 +0200 Subject: rules: Support BUILD_ARCH for CC defaults --- rules/transitions/EXPRESSIONS | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'rules/transitions') diff --git a/rules/transitions/EXPRESSIONS b/rules/transitions/EXPRESSIONS index 4fd0d1e9..596b20ef 100644 --- a/rules/transitions/EXPRESSIONS +++ b/rules/transitions/EXPRESSIONS @@ -1,13 +1,22 @@ { "for host": - { "vars": ["ARCH", "HOST_ARCH"] + { "vars": ["ARCH", "HOST_ARCH", "TARGET_ARCH"] , "expression": - { "type": "singleton_map" - , "key": "TARGET_ARCH" - , "value": - { "type": "var" - , "name": "HOST_ARCH" - , "default": {"type": "var", "name": "ARCH"} - } + { "type": "let*" + , "bindings": + [ [ "BUILD_ARCH" + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } + ] + , [ "TARGET_ARCH" + , { "type": "var" + , "name": "HOST_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } + ] + ] + , "body": {"type": "env", "vars": ["BUILD_ARCH", "TARGET_ARCH"]} } } , "target properties": -- cgit v1.2.3