summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2022-08-23 18:36:26 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2022-09-13 10:51:13 +0200
commit73e87f007185d94e21f26ea99396ddf1bbfc069f (patch)
tree8abdeae373b256df88f6d1aee9060c9ba93f6fb0
parentf9eaf2e93b6a53cef235770e9c48f4a7dc52facf (diff)
downloadjustbuild-73e87f007185d94e21f26ea99396ddf1bbfc069f.tar.gz
Just: Set default TARGET_ARCH and COMPILER_FAMILY
-rw-r--r--TARGETS10
-rw-r--r--test/TARGETS8
2 files changed, 17 insertions, 1 deletions
diff --git a/TARGETS b/TARGETS
index 2b4ab93b..04b3004b 100644
--- a/TARGETS
+++ b/TARGETS
@@ -22,9 +22,17 @@
}
, "just":
{ "type": ["@", "rules", "CC", "configure"]
- , "arguments_config": ["OS", "ARCH"]
+ , "arguments_config": ["OS", "ARCH", "TARGET_ARCH", "COMPILER_FAMILY"]
, "os": [{"type": "var", "name": "OS", "default": "linux"}]
, "arch": [{"type": "var", "name": "ARCH", "default": "x86_64"}]
+ , "target_arch":
+ [ { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default": {"type": "var", "name": "ARCH", "default": "x86_64"}
+ }
+ ]
+ , "compiler_family":
+ [{"type": "var", "name": "COMPILER_FAMILY", "default": "clang"}]
, "target": ["exported-just"]
}
, "libgit2":
diff --git a/test/TARGETS b/test/TARGETS
index 79ad3519..3f572f53 100644
--- a/test/TARGETS
+++ b/test/TARGETS
@@ -20,6 +20,14 @@
, "arguments_config": ["OS", "ARCH"]
, "os": [{"type": "var", "name": "OS", "default": "linux"}]
, "arch": [{"type": "var", "name": "ARCH", "default": "x86_64"}]
+ , "target_arch":
+ [ { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default": {"type": "var", "name": "ARCH", "default": "x86_64"}
+ }
+ ]
+ , "compiler_family":
+ [{"type": "var", "name": "COMPILER_FAMILY", "default": "clang"}]
, "target": ["TESTS"]
}
, "bootstrap-test":