diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:03:21 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:03:21 +0100 |
| commit | 65e841f4cb062c77fc6cb14e7283cb0c7a1f0bb8 (patch) | |
| tree | e7d9a912c304c030ad48637a82f2f513a83c1150 /rules/CC/prebuilt | |
| parent | b4dccdd9e27bb570e1d411f8238e4ed0c89e8e1b (diff) | |
| parent | 96f7a9f47ee4dafccced87e44f98afa3f14a3df9 (diff) | |
| download | rules-cc-65e841f4cb062c77fc6cb14e7283cb0c7a1f0bb8.tar.gz | |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/prebuilt')
| -rw-r--r-- | rules/CC/prebuilt/EXPRESSIONS | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/rules/CC/prebuilt/EXPRESSIONS b/rules/CC/prebuilt/EXPRESSIONS index 7b35c21..b84e494 100644 --- a/rules/CC/prebuilt/EXPRESSIONS +++ b/rules/CC/prebuilt/EXPRESSIONS @@ -208,18 +208,7 @@ } } ] - , [ "run-libs" - , { "type": "map_union" - , "$1": - [ { "type": "if" - , "cond": {"type": "var", "name": "shared"} - , "then": {"type": "var", "name": "libs"} - , "else": {"type": "empty_map"} - } - , {"type": "CALL_EXPRESSION", "name": "run-libs-deps"} - ] - } - ] + , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}] , [ "run-libs-args" , { "type": "nub_right" , "$1": @@ -300,6 +289,8 @@ { "type": "map_union" , "$1": [ {"type": "var", "name": "libs"} + , {"type": "var", "name": "link-deps"} + , {"type": "var", "name": "run-libs"} , { "type": "to_subdir" , "subdir": "pkgconfig" , "flat": true @@ -428,6 +419,18 @@ ] } ] + , [ "run-libs" + , { "type": "map_union" + , "$1": + [ { "type": "if" + , "cond": {"type": "var", "name": "shared"} + , "then": {"type": "var", "name": "libs"} + , "else": {"type": "empty_map"} + } + , {"type": "var", "name": "run-libs"} + ] + } + ] , [ "run-libs-args" , { "type": "++" , "$1": |