37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
|
index da5b179..6a772df 100644
|
|
--- a/src/cmd/dist/test.go
|
|
+++ b/src/cmd/dist/test.go
|
|
@@ -1247,18 +1247,20 @@ func (t *tester) cgoTest(dt *distTest) error {
|
|
fmt.Println("No support for static linking found (lacks libc.a?), skip cgo static linking test.")
|
|
} else {
|
|
if goos != "android" {
|
|
- t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
+ t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
|
|
}
|
|
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), ".")
|
|
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external`, ".")
|
|
if goos != "android" {
|
|
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
|
|
+ /*
|
|
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
|
|
// -static in CGO_LDFLAGS triggers a different code path
|
|
// than -static in -extldflags, so test both.
|
|
// See issue #16651.
|
|
cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", ".")
|
|
setEnv(cmd, "CGO_LDFLAGS", "-static -pthread")
|
|
+ */
|
|
}
|
|
}
|
|
|
|
@@ -1268,7 +1270,7 @@ func (t *tester) cgoTest(dt *distTest) error {
|
|
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal", "-tags=internal,internal_pie", ".")
|
|
}
|
|
t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie", ".")
|
|
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", ".")
|
|
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", "-tags=no_openssl")
|
|
}
|
|
}
|
|
}
|