From 76e1637449fcea8188b4e61a42d33a1b79e691a5 Mon Sep 17 00:00:00 2001
From: Peter Ebden <peter.ebden@gmail.com>
Date: Tue, 3 Dec 2024 09:35:05 +0000
Subject: [PATCH] pkg_config arguments now come before ldflags when acquired
 from cgo_library

---
 ChangeLog                | 4 ++++
 VERSION                  | 2 +-
 build_defs/go.build_defs | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 75076e8..80bf100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 1.23.0
+--------------
+    * pkg_config arguments now come before ldflags when acquired from cgo_library
+
 Version 1.22.0
 --------------
     * Plumb cc_hdrs provide though cgo_library (#307)
diff --git a/VERSION b/VERSION
index 80a81c0..bfbadb3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.22.0
\ No newline at end of file
+1.23.0
\ No newline at end of file
diff --git a/build_defs/go.build_defs b/build_defs/go.build_defs
index 5a53619..4415d59 100644
--- a/build_defs/go.build_defs
+++ b/build_defs/go.build_defs
@@ -1683,9 +1683,9 @@ def _go_binary_cmds(name, static=False, ldflags='', pkg_config='', definitions=N
     defs = ' '.join([f'-X "{linkerdef}"' for linkerdef in linkerdefs])
 
     if static:
-        flags = f'-linkmode external -extldflags "-static {ldflags} {pkg_config}"'
+        flags = f'-linkmode external -extldflags "-static {pkg_config} {ldflags}"'
     elif ldflags or pkg_config:
-        flags = f'-extldflags "{ldflags} {pkg_config}"'
+        flags = f'-extldflags "{pkg_config} {ldflags}"'
     else:
         flags = ''