diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:38:40 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:38:40 +0200 |
| commit | 14300d3768522b1a201c30c94b6e54e096520b20 (patch) | |
| tree | eaa057fd88ddba1a94c48585fcfcbb71628fcbe7 /rules/CC/proto | |
| parent | 2d7051782625966857286aace6ff18760114ecc7 (diff) | |
| parent | 9f535dadf06c6c6554bac632069777cf1b63ebf5 (diff) | |
| download | rules-cc-14300d3768522b1a201c30c94b6e54e096520b20.tar.gz | |
Merge commit '9f535dadf06c6c6554bac632069777cf1b63ebf5' into rules/rules-cc
Diffstat (limited to 'rules/CC/proto')
| -rw-r--r-- | rules/CC/proto/EXPRESSIONS | 11 | ||||
| -rw-r--r-- | rules/CC/proto/RULES | 16 |
2 files changed, 15 insertions, 12 deletions
diff --git a/rules/CC/proto/EXPRESSIONS b/rules/CC/proto/EXPRESSIONS index 894b80b..6be74df 100644 --- a/rules/CC/proto/EXPRESSIONS +++ b/rules/CC/proto/EXPRESSIONS @@ -138,14 +138,9 @@ , ["TOOLCHAIN_DIR", "toolchain"] , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}] , [ "TOOLCHAIN" - , { "type": "if" - , "cond": {"type": "var", "name": "TOOLCHAIN"} - , "then": - { "type": "to_subdir" - , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"} - , "$1": {"type": "var", "name": "TOOLCHAIN"} - } - , "else": {"type": "empty_map"} + , { "type": "to_subdir" + , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"} + , "$1": {"type": "var", "name": "TOOLCHAIN"} } ] , [ "NON_SYSTEM_TOOLS" diff --git a/rules/CC/proto/RULES b/rules/CC/proto/RULES index 6d2e725..ac7a371 100644 --- a/rules/CC/proto/RULES +++ b/rules/CC/proto/RULES @@ -61,6 +61,8 @@ , "compile-args-deps": ["CC", "compile-args-deps"] , "link-deps": ["CC", "link-deps"] , "link-args-deps": ["CC", "link-args-deps"] + , "run-libs-deps": ["CC", "run-libs-deps"] + , "run-libs-args-deps": ["CC", "run-libs-args-deps"] , "cflags-files-deps": ["CC", "cflags-files-deps"] , "ldflags-files-deps": ["CC", "ldflags-files-deps"] , "for host": ["transitions", "for host"] @@ -193,6 +195,10 @@ ] , ["link-deps", {"type": "CALL_EXPRESSION", "name": "link-deps"}] , ["link-args", {"type": "CALL_EXPRESSION", "name": "link-args-deps"}] + , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}] + , [ "run-libs-args" + , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"} + ] , [ "cflags-files" , {"type": "CALL_EXPRESSION", "name": "cflags-files-deps"} ] @@ -216,6 +222,8 @@ , "compile-args" , "link-deps" , "link-args" + , "run-libs" + , "run-libs-args" , "package" ] } @@ -245,8 +253,8 @@ , "$1": {"type": "FIELD", "name": "stage"} } ] - , ["public-fieldnames", ["deps", "proto-defaults"]] - , ["private-fieldnames", ["deps", "proto-defaults"]] + , ["public-fieldnames", ["deps", "proto-defaults", "defaults"]] + , ["private-fieldnames", ["deps", "proto-defaults", "defaults"]] ] , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"} } @@ -277,8 +285,8 @@ , "$1": {"type": "FIELD", "name": "stage"} } ] - , ["public-fieldnames", ["deps", "proto-defaults"]] - , ["private-fieldnames", ["deps", "proto-defaults"]] + , ["public-fieldnames", ["deps", "proto-defaults", "defaults"]] + , ["private-fieldnames", ["deps", "proto-defaults", "defaults"]] ] , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"} } |