summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-08-16 12:48:17 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-08-16 15:30:32 +0200
commit5e71dca741099d9587fa4b705242673d45316162 (patch)
tree4d5c6eca9b3798a897f487b4b181978cb045f474
parenta9f68b1f9b2445fe42d72f03c44d084e8ef0d444 (diff)
downloadjustbuild-5e71dca741099d9587fa4b705242673d45316162.tar.gz
rules: Remove pointless defaults
-rw-r--r--rules/CC/EXPRESSIONS32
-rw-r--r--rules/CC/proto/EXPRESSIONS20
2 files changed, 13 insertions, 39 deletions
diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS
index cad28e8c..0ac44d27 100644
--- a/rules/CC/EXPRESSIONS
+++ b/rules/CC/EXPRESSIONS
@@ -6,9 +6,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "CC"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -21,9 +19,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "CXX"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -36,9 +32,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "AR"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -51,9 +45,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "CFLAGS"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -66,9 +58,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "CXXFLAGS"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -81,9 +71,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "LDFLAGS"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -96,9 +84,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "ENV"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
, ["default", {"type": "empty_map"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
@@ -112,9 +98,7 @@
, "bindings":
[ ["fieldname", "defaults"]
, ["provider", "TOOLCHAIN"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
, ["default", {"type": "empty_map"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
diff --git a/rules/CC/proto/EXPRESSIONS b/rules/CC/proto/EXPRESSIONS
index 6be74df9..84d3d55e 100644
--- a/rules/CC/proto/EXPRESSIONS
+++ b/rules/CC/proto/EXPRESSIONS
@@ -6,9 +6,7 @@
, "bindings":
[ ["fieldname", "proto-defaults"]
, ["provider", "PROTOC"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -21,9 +19,7 @@
, "bindings":
[ ["fieldname", "proto-defaults"]
, ["provider", "LDFLAGS"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -36,9 +32,7 @@
, "bindings":
[ ["fieldname", "proto-defaults"]
, ["provider", "GRPC_PLUGIN"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
}
@@ -51,9 +45,7 @@
, "bindings":
[ ["fieldname", "proto-defaults"]
, ["provider", "ENV"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
, ["default", {"type": "empty_map"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
@@ -67,9 +59,7 @@
, "bindings":
[ ["fieldname", "proto-defaults"]
, ["provider", "TOOLCHAIN"]
- , [ "transition"
- , {"type": "var", "name": "defaults-transition", "default": null}
- ]
+ , ["transition", {"type": "var", "name": "defaults-transition"}]
, ["default", {"type": "empty_map"}]
]
, "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}