From 04baa0f7461403d38c486945b5d43e34ec33504d Mon Sep 17 00:00:00 2001 From: Chloe Kudryavtsev Date: Sun, 16 Apr 2023 16:35:22 -0400 Subject: meta: use non-static config for now opens the way for static flags once I can test those --- project.janet | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/project.janet b/project.janet index 6bc1246..b0e1994 100644 --- a/project.janet +++ b/project.janet @@ -25,20 +25,29 @@ (fn pkgconf [defval & args] (if bin - (string/split " " (-> bin - (execute ;args) - (get :out) - (string/trim))) + (->> (-> bin + (execute ;args) + (get :out) + string/trim) + (string/split " ") + (filter |(< 0 (length $)))) defval)))) -(def curl-cflags (pkgconf [] - "libcurl" "--cflags" "--static")) -(def curl-ldflags (pkgconf ["-lcurl"] - "libcurl" "--libs" "--static")) +(def {:cflags curl-cflags + :ldflags curl-ldflags} + (let [cflags (partial pkgconf [] "libcurl" "--cflags") + ldflags (partial pkgconf ["-lcurl"] "libcurl" "--libs") + curl-c (cflags) + curl-l (ldflags) + scurl-c (cflags "--static") + scurl-l (cflags "--static")] + # TODO: test scurl-c and scurl-l to pass those if applicable + {:cflags curl-c + :ldflags curl-l})) (declare-native :name "jurl/native" - :cflags [;default-cflags ;curl-cflags] - :ldflags [;default-lflags ;curl-ldflags] + :cflags [;default-cflags ;curl-cflags] + :ldflags [;default-ldflags ;curl-ldflags] :headers ["src/jurl.h"] :source ["src/main.c" "src/jurl.c" -- cgit v1.2.3