From: fennecdjay Date: Mon, 27 Feb 2023 11:55:58 +0000 (+0100) Subject: :wrench: work on config build X-Git-Tag: nightly~199 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=21eafe38ca190a8d57d27b09f5b18fa93acc5545;p=gwion.git :wrench: work on config build --- diff --git a/fmt b/fmt index 5f22a51a..aac1f51d 160000 --- a/fmt +++ b/fmt @@ -1 +1 @@ -Subproject commit 5f22a51a47f2fe5f1d7f1d52822ba0b08b2d3688 +Subproject commit aac1f51dea1d9ba089d3c6632f6a965911f445d7 diff --git a/plug b/plug index b2efe4eb..cee067f0 160000 --- a/plug +++ b/plug @@ -1 +1 @@ -Subproject commit b2efe4eb2854740744f54d04442c020e3489f353 +Subproject commit cee067f06667e7d837464dbe4e1a29bba2317066 diff --git a/scripts/embed.bash b/scripts/embed.bash index 548bda6b..9e09ac62 100644 --- a/scripts/embed.bash +++ b/scripts/embed.bash @@ -91,10 +91,6 @@ jq -rc '.[]' <<< "$libraries" | if [ "$cflags" != "null" ] then config "CFLAGS += $cflags" fi - ldflags=$(jq -c '.ldflags' <<< "$lib") - if [ "$ldflags" != "null" ] - then config "LDFLAGS += $ldflags" - fi config "LDFLAGS += $path" if [ "$names" != "null" ] then @@ -105,6 +101,10 @@ jq -rc '.[]' <<< "$libraries" | handle_lib "$path" "$name" done fi + ldflags=$(jq -c '.ldflags' <<< "$lib") + if [ "$ldflags" != "null" ] + then config "LDFLAGS += $ldflags" + fi done handle_script() {