From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 26 May 2015 20:49:59 +0000 (-0700)
Subject: cmd/link/internal/amd64: -buildmode=c-archive forces external link mode
X-Git-Tag: go1.5beta1~473
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b2f95a167aacc11177d66d1a3235d84a2b1f3538;p=gostls13.git

cmd/link/internal/amd64: -buildmode=c-archive forces external link mode

At some point this code should probably move to cmd/link/internal/ld,
but at least for now just handle c-archive like c-shared.

Change-Id: Ic17656529cb0fe189a37f15e670350ab13bb5276
Reviewed-on: https://go-review.googlesource.com/10385
Reviewed-by: Andrew Gerrand <adg@golang.org>
---

diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
index e489bb75a9..bb65067e87 100644
--- a/src/cmd/link/internal/amd64/obj.go
+++ b/src/cmd/link/internal/amd64/obj.go
@@ -90,7 +90,7 @@ func archinit() {
 		ld.Linkmode = ld.LinkInternal
 	}
 
-	if ld.Buildmode == ld.BuildmodeCShared || ld.DynlinkingGo() {
+	if ld.Buildmode == ld.BuildmodeCArchive || ld.Buildmode == ld.BuildmodeCShared || ld.DynlinkingGo() {
 		ld.Linkmode = ld.LinkExternal
 	}