fix: native build of syscalls on android and illumos

As per https://golang.org/cmd/go/#hdr-Build_constraints, using GOOS=android also matches tags and files for GOOS=linux, so exclude it explicetly to avoid collisions. Also using GOOS=illumos matches tags and files for GOOS=solaris. Fixes #843.
traefik · Sep 14, 2020 · 1edb6a1 · 1edb6a1
1 parent a2f5643
commit 1edb6a1
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 10 deletions.
diff --git a/extract/extract.go b/extract/extract.go
@@ -216,6 +216,19 @@ func genContent(dest, importPath, license string, p *types.Package, skip map[str
 		buildTags += ",!windows,!nacl,!plan9"
 	}
 
+	if importPath == "syscall" {
+		// As per https://golang.org/cmd/go/#hdr-Build_constraints,
+		// using GOOS=android also matches tags and files for GOOS=linux,
+		// so exclude it explicitly to avoid collisions (issue #843).
+		// Also using GOOS=illumos matches tags and files for GOOS=solaris.
+		switch os.Getenv("GOOS") {
+		case "android":
+			buildTags += ",!linux"
+		case "illumos":
+			buildTags += ",!solaris"
+		}
+	}
+
 	b := new(bytes.Buffer)
 	data := map[string]interface{}{
 		"Dest":      dest,

diff --git a/interp/build.go b/interp/build.go
@@ -162,6 +162,7 @@ var knownOs = map[string]bool{
 	"darwin":    true,
 	"dragonfly": true,
 	"freebsd":   true,
+	"illumos":   true,
 	"js":        true,
 	"linux":     true,
 	"nacl":      true,

diff --git a/stdlib/syscall/go1_14_syscall_android_386.go b/stdlib/syscall/go1_14_syscall_android_386.go
diff --git a/stdlib/syscall/go1_14_syscall_android_amd64.go b/stdlib/syscall/go1_14_syscall_android_amd64.go
diff --git a/stdlib/syscall/go1_14_syscall_android_arm.go b/stdlib/syscall/go1_14_syscall_android_arm.go
diff --git a/stdlib/syscall/go1_14_syscall_android_arm64.go b/stdlib/syscall/go1_14_syscall_android_arm64.go
diff --git a/stdlib/syscall/go1_14_syscall_illumos_amd64.go b/stdlib/syscall/go1_14_syscall_illumos_amd64.go
diff --git a/stdlib/syscall/go1_15_syscall_android_386.go b/stdlib/syscall/go1_15_syscall_android_386.go
diff --git a/stdlib/syscall/go1_15_syscall_android_amd64.go b/stdlib/syscall/go1_15_syscall_android_amd64.go
diff --git a/stdlib/syscall/go1_15_syscall_android_arm.go b/stdlib/syscall/go1_15_syscall_android_arm.go
diff --git a/stdlib/syscall/go1_15_syscall_android_arm64.go b/stdlib/syscall/go1_15_syscall_android_arm64.go
diff --git a/stdlib/syscall/go1_15_syscall_illumos_amd64.go b/stdlib/syscall/go1_15_syscall_illumos_amd64.go