]> Nishi Git Mirror - gwion.git/commitdiff
:wrench: work on config build
authorfennecdjay <fennecdjay@gmail.com>
Mon, 27 Feb 2023 11:55:58 +0000 (12:55 +0100)
committerfennecdjay <fennecdjay@gmail.com>
Mon, 27 Feb 2023 11:55:58 +0000 (12:55 +0100)
fmt
plug
scripts/embed.bash

diff --git a/fmt b/fmt
index 5f22a51a47f2fe5f1d7f1d52822ba0b08b2d3688..aac1f51dea1d9ba089d3c6632f6a965911f445d7 160000 (submodule)
--- a/fmt
+++ b/fmt
@@ -1 +1 @@
-Subproject commit 5f22a51a47f2fe5f1d7f1d52822ba0b08b2d3688
+Subproject commit aac1f51dea1d9ba089d3c6632f6a965911f445d7
diff --git a/plug b/plug
index b2efe4eb2854740744f54d04442c020e3489f353..cee067f06667e7d837464dbe4e1a29bba2317066 160000 (submodule)
--- a/plug
+++ b/plug
@@ -1 +1 @@
-Subproject commit b2efe4eb2854740744f54d04442c020e3489f353
+Subproject commit cee067f06667e7d837464dbe4e1a29bba2317066
index 548bda6bb0bc7f52c936f685df03a0bc282eeb61..9e09ac625329342ebd8e42c4308f91d643f7f0b2 100644 (file)
@@ -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() {