summaryrefslogtreecommitdiff
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
commit5c5ecfb43c7f200e258a6412f121bb30b7454511 (patch)
tree96bcb9153111a07edbadde69a2e0f162f6878e3c
parent177354f60872b465a1471683d41617e856940160 (diff)
downloadrules-cc-5c5ecfb43c7f200e258a6412f121bb30b7454511.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.
-rw-r--r--CC/EXPRESSIONS30
1 files changed, 27 insertions, 3 deletions
diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS
index 067fc0d..7d9dfa1 100644
--- a/CC/EXPRESSIONS
+++ b/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":