summaryrefslogtreecommitdiff
path: root/src/cmd/go/pkg.go
diff options
context:
space:
mode:
authorDavid Crawshaw <crawshaw@golang.org>2015-10-19 16:31:20 -0400
committerDavid Crawshaw <crawshaw@golang.org>2015-10-23 19:51:55 +0000
commitb7e4de4b1ec67b57dfaa7a447578ddb6d759efab (patch)
tree19bf5ec91acdbe2db3ffbbebaa4c0d0bbb03ca9c /src/cmd/go/pkg.go
parent22d4c8bf13d5edf4670dbdaf0854d653d9c2b81a (diff)
downloadgo-git-b7e4de4b1ec67b57dfaa7a447578ddb6d759efab.tar.gz
cmd/go, cmd/link: -buildmode=pie for linux/amd64
Depends on external linking right now. I have no immediate use for this, but wanted to check how hard it is to support as android/amd64 is coming and it will require PIE. Change-Id: I65c6b19159f40db4c79cf312cd0368c2b2527bfd Reviewed-on: https://go-review.googlesource.com/16072 Reviewed-by: Ian Lance Taylor <iant@golang.org> Run-TryBot: David Crawshaw <crawshaw@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/go/pkg.go')
-rw-r--r--src/cmd/go/pkg.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 78bd72f52b..f3d711fd47 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -825,10 +825,10 @@ func (p *Package) load(stk *importStack, bp *build.Package, err error) *Package
importPaths = append(importPaths, "syscall")
}
- // Currently build mode c-shared, or -linkshared, forces
+ // Currently build modes c-shared, pie, and -linkshared force
// external linking mode, and external linking mode forces an
// import of runtime/cgo.
- if p.Name == "main" && !p.Goroot && (buildBuildmode == "c-shared" || buildLinkshared) {
+ if p.Name == "main" && !p.Goroot && (buildBuildmode == "c-shared" || buildBuildmode == "pie" || buildLinkshared) {
importPaths = append(importPaths, "runtime/cgo")
}