Merge pull request #2222 from mendersoftware/cherry-scarthgap-revert-…

…to-static-link [Cherry scarthgap]: MEN-7275 (follow-up): Prefer static linkage for `mender-connect` and `mender-snapshot`
mendersoftware · Dec 10, 2024 · d9e0a9a · d9e0a9a
2 parents 7f3d868 + 9bfb43f
commit d9e0a9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/meta-mender-core/recipes-mender/mender-connect/mender-connect.inc b/meta-mender-core/recipes-mender/mender-connect/mender-connect.inc
@@ -20,6 +20,9 @@ inherit systemd
 
 GO_IMPORT = "github.com/mendersoftware/mender-connect"
 
+# Prefer static linkage (golang's default)
+GO_LINKSHARED = ""
+
 python do_prepare_mender_connect_conf() {
     import json
 

diff --git a/meta-mender-core/recipes-mender/mender-snapshot/mender-snapshot.inc b/meta-mender-core/recipes-mender/mender-snapshot/mender-snapshot.inc
@@ -11,6 +11,9 @@ inherit go-ptest
 
 GO_IMPORT = "github.com/mendersoftware/mender-snapshot"
 
+# Prefer static linkage (golang's default)
+GO_LINKSHARED = ""
+
 # Set the version of mender-snapshot by passing it as an extra ldflag to go.bbclass
 # This is equivalent to how it's set in the Makefile
 GO_EXTRA_LDFLAGS:append = "-X github.com/mendersoftware/mender-snapshot/conf.Version=$(git describe --tags --dirty --exact-match 2>/dev/null || git rev-parse --short HEAD)"