diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-07 15:14:46 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-16 15:30:32 +0200 |
commit | e17365cb6d1af6ae12fdaaf97f28a02c7ee61bed (patch) | |
tree | 82d99bb4f6d2ce2d3c0b12108becd425759d0e40 /rules/transitions | |
parent | ddc7e2c87d5b92f6fefce3f68d0d78d2d022044a (diff) | |
download | justbuild-e17365cb6d1af6ae12fdaaf97f28a02c7ee61bed.tar.gz |
rules: Support BUILD_ARCH for CC defaults
Diffstat (limited to 'rules/transitions')
-rw-r--r-- | rules/transitions/EXPRESSIONS | 25 |
1 files changed, 17 insertions, 8 deletions
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": |