diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-09-14 15:46:33 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-09-14 16:12:58 +0200 |
| commit | d2e1522b1d43fe9ddf33510049ca6e29871e88f3 (patch) | |
| tree | fdf1bf69da4eb6217f0abf01d921d4dc7f38b668 | |
| parent | fde7ef4f123d65f6a40b5de22b5f9d8c75f3e5ae (diff) | |
| download | justbuild-d2e1522b1d43fe9ddf33510049ca6e29871e88f3.tar.gz | |
Defaults: Fix setting TARGET_ARCH from ARCH if not set
| -rw-r--r-- | etc/defaults/CC/TARGETS | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/etc/defaults/CC/TARGETS b/etc/defaults/CC/TARGETS index d51c8218..39e26f86 100644 --- a/etc/defaults/CC/TARGETS +++ b/etc/defaults/CC/TARGETS @@ -41,24 +41,11 @@ } , "toolchain": { "type": ["CC", "defaults"] - , "arguments_config": - ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"] + , "arguments_config": ["OS", "ARCH", "COMPILER_FAMILY"] , "base": { "type": "let*" , "bindings": - [ [ "HOST_ARCH" - , { "type": "var" - , "name": "HOST_ARCH" - , "default": {"type": "var", "name": "ARCH"} - } - ] - , [ "TARGET_ARCH" - , { "type": "var" - , "name": "TARGET_ARCH" - , "default": {"type": "var", "name": "ARCH"} - } - ] - , [ "COMPILER_FAMILY" + [ [ "COMPILER_FAMILY" , { "type": "if" , "cond": { "type": "and" @@ -94,7 +81,7 @@ } , "gcc": { "type": ["CC", "defaults"] - , "arguments_config": ["OS", "HOST_ARCH", "TARGET_ARCH"] + , "arguments_config": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH"] , "CC": { "type": "let*" , "bindings": @@ -103,7 +90,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] @@ -132,7 +122,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] @@ -161,7 +154,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] @@ -186,7 +182,7 @@ } , "clang": { "type": ["CC", "defaults"] - , "arguments_config": ["OS", "HOST_ARCH", "TARGET_ARCH"] + , "arguments_config": ["OS", "ARCH", "TARGET_ARCH"] , "CC": ["clang"] , "CXX": ["clang++"] , "AR": @@ -197,7 +193,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] @@ -226,7 +225,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] @@ -257,7 +259,10 @@ , "separator": "_" , "$1": [ {"type": "var", "name": "OS"} - , {"type": "var", "name": "TARGET_ARCH"} + , { "type": "var" + , "name": "TARGET_ARCH" + , "default": {"type": "var", "name": "ARCH"} + } ] } ] |