don't hardcode zdl.go

Author: qmuntal

cmd/mkcgo/generate.go

@@ -696,16 +696,16 @@ func needsAssembly(src *mkcgo.Source) bool {
 }
 
 // generateNocgoGo generates Go source file for nocgo mode from src.
-func generateNocgoGo(src *mkcgo.Source, w io.Writer, isZdlFile bool) {
+func generateNocgoGo(src *mkcgo.Source, w io.Writer) {
 	// Output header notice and package declaration.
 	printHeader(w)
 
 	// Set build tag based on whether this is a zdl file
-	if isZdlFile {
-		fmt.Fprintf(w, "//go:build !cgo && unix\n\n")
-	} else {
-		fmt.Fprintf(w, "//go:build !cgo\n\n")
+	tags := "!cgo"
+	if *extratags != "" {
+		tags += " && (" + *extratags + ")"
 	}
+	fmt.Fprintf(w, "//go:build %s\n\n", tags)
 
 	fmt.Fprintf(w, "package %s\n\n", *packageName)
 

cmd/mkcgo/main.go

@@ -22,6 +22,7 @@ var (
 	mode          = flag.String("mode", "dynamic", "symbol load mode: dynamic, dynload")
 	private       = flag.Bool("private", false, "all Go generated symbols are kept unexported")
 	noerrors      = flag.Bool("noerrors", false, "disable error handling")
+	extratags     = flag.String("tags", "", "tags to add to the generated files")
 )
 
 func usage() {
@@ -76,11 +77,10 @@ func main() {
 		} else {
 			baseNameForCheck = strings.TrimSuffix(baseNameForCheck, ".go")
 		}
-		isZdlFile := strings.HasPrefix(baseNameForCheck, "zdl")
 
 		// Generate nocgo mode files
 		var nocgoGoBuffer, assemblyBuffer bytes.Buffer
-		generateNocgoGo(&src, &nocgoGoBuffer, isZdlFile)
+		generateNocgoGo(&src, &nocgoGoBuffer)
 
 		// Only generate assembly if needed (i.e., not all functions are static)
 		needsAsm := needsAssembly(&src)
@@ -94,11 +94,6 @@ func main() {
 		// Determine suffix based on the base name
 		suffix := "_nocgo.go"
 
-		// Special case for zdl files - use _nocgo_unix.go suffix
-		if isZdlFile {
-			suffix = "_nocgo_unix.go"
-		}
-
 		files := []struct {
 			suffix string
 			data   []byte

internal/ossl/ossl.go

@@ -3,7 +3,7 @@ package ossl
 
 //go:generate go run ../../cmd/mkcgo -out zossl.go -mode dynload -package ossl shims.h
 //go:generate go run ../../cmd/mkcgo -out zossl.go -nocgo -mode dynload -package ossl shims.h
-//go:generate go run ../../cmd/mkcgo -out zdl.go -nocgo -mode dynamic -noerrors -package ossl dl.h
+//go:generate go run ../../cmd/mkcgo -out zdl.go -nocgo -mode dynamic -noerrors -package ossl -tags unix dl.h
 
 import "unsafe"