diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-16 21:10:18 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-16 21:10:40 +0100 |
| commit | 96a642f37b746c9b1d83ab6ec946d2fc0372e789 (patch) | |
| tree | 0aaf869b68542c379c8573a285b066738a694732 /rules/CC/EXPRESSIONS | |
| parent | 36a66f98fa2022c53b3792110549f27f3ce5336c (diff) | |
| parent | e97ac1a8de806e7bccd6a8be8436e95cf2bbb341 (diff) | |
| download | rules-cc-96a642f37b746c9b1d83ab6ec946d2fc0372e789.tar.gz | |
Merge commit 'e97ac1a8de806e7bccd6a8be8436e95cf2bbb341' into rules-cc
Diffstat (limited to 'rules/CC/EXPRESSIONS')
| -rw-r--r-- | rules/CC/EXPRESSIONS | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS index 2998fa8..504e55a 100644 --- a/rules/CC/EXPRESSIONS +++ b/rules/CC/EXPRESSIONS @@ -681,6 +681,7 @@ , "private-hdrs" , "cflags" , "private-cflags" + , "ldflags" , "private-ldflags" , "stage" , "extra-provides" @@ -721,6 +722,7 @@ { "type": "++" , "$1": [ {"type": "keys", "$1": {"type": "var", "name": "lib"}} + , {"type": "var", "name": "ldflags", "default": []} , {"type": "var", "name": "private-ldflags", "default": []} , {"type": "CALL_EXPRESSION", "name": "link-args-deps"} ] @@ -936,6 +938,7 @@ , "private-hdrs" , "cflags" , "private-cflags" + , "ldflags" , "private-ldflags" , "soversion" , "extra-provides" @@ -977,7 +980,8 @@ , "$1": { "type": "++" , "$1": - [ {"type": "var", "name": "private-ldflags", "default": []} + [ {"type": "var", "name": "ldflags", "default": []} + , {"type": "var", "name": "private-ldflags", "default": []} , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"} ] } @@ -1008,7 +1012,16 @@ } ] , [ "run-libs-args" - , {"type": "keys", "$1": {"type": "var", "name": "lib"}} + , { "type": "nub_right" + , "$1": + { "type": "++" + , "$1": + [ {"type": "keys", "$1": {"type": "var", "name": "lib"}} + , {"type": "var", "name": "ldflags", "default": []} + , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"} + ] + } + } ] ] , "body": |