From 40d6a2decf29a697a0aaa9ed211aaf5c4102f855 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Mon, 8 May 2023 17:10:19 +0200 Subject: rules: prebuilt expr calls pkg-config with --static ... for static prebuilt libraries. --- CC/prebuilt/EXPRESSIONS | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'CC/prebuilt/EXPRESSIONS') diff --git a/CC/prebuilt/EXPRESSIONS b/CC/prebuilt/EXPRESSIONS index 6bfd874..6b7169a 100644 --- a/CC/prebuilt/EXPRESSIONS +++ b/CC/prebuilt/EXPRESSIONS @@ -288,6 +288,13 @@ } } ] + , [ "pc-args" + , { "type": "if" + , "cond": {"type": "var", "name": "shared"} + , "then": [] + , "else": ["--static"] + } + ] , [ "cflags-filename" , {"type": "join", "$1": [{"type": "var", "name": "name"}, ".cflags"]} ] @@ -307,10 +314,15 @@ ] } , "cmd": - [ "./config_reader" - , {"type": "var", "name": "cflags-filename"} - , {"type": "var", "name": "main-pkg-config"} - ] + { "type": "++" + , "$1": + [ [ "./config_reader" + , {"type": "var", "name": "cflags-filename"} + , {"type": "var", "name": "main-pkg-config"} + ] + , {"type": "var", "name": "pc-args"} + ] + } , "env": {"type": "var", "name": "ENV"} , "outs": [{"type": "var", "name": "cflags-filename"}] } @@ -368,10 +380,15 @@ ] } , "cmd": - [ "./config_reader" - , {"type": "var", "name": "ldflags-filename"} - , {"type": "var", "name": "main-pkg-config"} - ] + { "type": "++" + , "$1": + [ [ "./config_reader" + , {"type": "var", "name": "ldflags-filename"} + , {"type": "var", "name": "main-pkg-config"} + ] + , {"type": "var", "name": "pc-args"} + ] + } , "env": {"type": "var", "name": "ENV"} , "outs": [{"type": "var", "name": "ldflags-filename"}] } -- cgit v1.2.3