imp: adjust build directives to be more flexible, allowing cgo but disabling libwasmvm linking

damiannolan · damiannolan · commit 1dba29fc5689 · 2024-03-20T10:12:24.000+01:00
diff --git a/ibc_test.go b/ibc_test.go
@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !nolink_libwasmvm
 
 package cosmwasm
 
diff --git a/lib.go b/lib.go
@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !nolink_libwasmvm
 
 // This file contains the part of the API that is exposed when cgo is enabled.
 
diff --git a/lib_test.go b/lib_test.go
@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !nolink_libwasmvm
 
 package cosmwasm
 
diff --git a/version_cgo.go b/version_cgo.go
@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !nolink_libwasmvm
 
 package cosmwasm
 
diff --git a/version_no_cgo.go b/version_no_cgo.go
@@ -1,4 +1,4 @@
-//go:build !cgo
+//go:build !cgo || nolink_libwasmvm
 
 package cosmwasm
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build cgo`
	`1`	`+//go:build cgo && !nolink_libwasmvm`
`2`	`2`
`3`	`3`	`package cosmwasm`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !cgo`
	`1`	`+//go:build !cgo \|\| nolink_libwasmvm`
`2`	`2`
`3`	`3`	`package cosmwasm`
`4`	`4`