diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-01-20 16:20:30 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-01-20 16:20:30 +0100 |
| commit | 89b76f2558da0c41280b9eb389384824babfbef6 (patch) | |
| tree | 489057736f3fcc4f9e14bcb27e14eb0effbd815a /rules/CC/RULES | |
| parent | 25981eeccf645ddc6338bed0b159014f210f4326 (diff) | |
| parent | e75f101e8b988adb458e594ffaaaebc0c01f65df (diff) | |
| download | rules-cc-89b76f2558da0c41280b9eb389384824babfbef6.tar.gz | |
Merge commit 'e75f101e8b988adb458e594ffaaaebc0c01f65df' into rules-cc
Diffstat (limited to 'rules/CC/RULES')
| -rw-r--r-- | rules/CC/RULES | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/rules/CC/RULES b/rules/CC/RULES index 91fcf3d..730d45b 100644 --- a/rules/CC/RULES +++ b/rules/CC/RULES @@ -624,7 +624,8 @@ , "expression": { "type": "let*" , "bindings": - [ [ "install-stage" + [ ["pc-install-dir", "share/pkgconfig"] + , [ "install-stage" , { "type": "disjoint_map_union" , "msg": "install stages may not overlap" , "$1": @@ -770,11 +771,32 @@ ] } ] + , [ "pkg-flag-files" + , { "type": "map_union" + , "$1": + [ { "type": "lookup" + , "key": "cflags-files" + , "map": {"type": "var", "name": "package"} + , "default": {"type": "empty_map"} + } + , { "type": "lookup" + , "key": "ldflags-files" + , "map": {"type": "var", "name": "package"} + , "default": {"type": "empty_map"} + } + ] + } + ] , ["pkg-libs", {"type": "var", "name": "libraries"}] , ["flat-libs", {"type": "FIELD", "name": "flat-libs"}] ] , "body": - {"type": "CALL_EXPRESSION", "name": "pkg-config"} + { "type": "map_union" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "pkg-config"} + , {"type": "var", "name": "pkg-flag-files"} + ] + } } , "else": {"type": "empty_map"} } @@ -800,7 +822,7 @@ , "$1": {"type": "var", "name": "libraries"} } , { "type": "to_subdir" - , "subdir": "share/pkgconfig" + , "subdir": {"type": "var", "name": "pc-install-dir"} , "$1": {"type": "var", "name": "pkg-config"} } ] |