summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-05-27 15:03:20 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-05-27 15:37:00 +0200
commit20afd06b78c614299dc05e2044fc8ffe5dfa5977 (patch)
treeb53a1f58b4bef5504135e436186ac8b9a6ceaddb /rules
parent2681a4b826e9b5bd3db3482bf491348084a1df64 (diff)
downloadjustbuild-20afd06b78c614299dc05e2044fc8ffe5dfa5977.tar.gz
CC: if no CC/CXX/AR is provided via the toolchain, default to cc/c++/ar
... instead of defaulting to "". In this way, an empty default target can be used as toolchain defaults for systems with default names.
Diffstat (limited to 'rules')
-rw-r--r--rules/CC/EXPRESSIONS30
1 files changed, 27 insertions, 3 deletions
diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS
index 067fc0d0..7d9dfa1d 100644
--- a/rules/CC/EXPRESSIONS
+++ b/rules/CC/EXPRESSIONS
@@ -7,8 +7,16 @@
[ ["fieldname", "defaults"]
, ["provider", "CC"]
, ["transition", {"type": "var", "name": "defaults-transition"}]
+ , ["CC", {"type": "CALL_EXPRESSION", "name": "list_provider"}]
+ , [ "CC"
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "CC"}
+ , "then": {"type": "var", "name": "CC"}
+ , "else": ["cc"]
+ }
+ ]
]
- , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+ , "body": {"type": "var", "name": "CC"}
}
}
, "default-CXX":
@@ -20,8 +28,16 @@
[ ["fieldname", "defaults"]
, ["provider", "CXX"]
, ["transition", {"type": "var", "name": "defaults-transition"}]
+ , ["CXX", {"type": "CALL_EXPRESSION", "name": "list_provider"}]
+ , [ "CXX"
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "CXX"}
+ , "then": {"type": "var", "name": "CXX"}
+ , "else": ["c++"]
+ }
+ ]
]
- , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+ , "body": {"type": "var", "name": "CXX"}
}
}
, "default-AR":
@@ -33,8 +49,16 @@
[ ["fieldname", "defaults"]
, ["provider", "AR"]
, ["transition", {"type": "var", "name": "defaults-transition"}]
+ , ["AR", {"type": "CALL_EXPRESSION", "name": "list_provider"}]
+ , [ "AR"
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "AR"}
+ , "then": {"type": "var", "name": "AR"}
+ , "else": ["ar"]
+ }
+ ]
]
- , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+ , "body": {"type": "var", "name": "AR"}
}
}
, "default-CFLAGS":