languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-02 09:28:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc/cgo/testcarchive: fix path of libgo.a for darwin/arm

Browse source 
After CL 22461, c-archive build on darwin/arm is by default compiled
with -shared, so update the install path.

Fix build.

Change-Id: Ie93dbd226ed416b834da0234210f4b98bc0e3606
Reviewed-on: https://go-review.googlesource.com/22507
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Cherry Zhang 2016-04-27 15:44:22 -04:00 committed by David Crawshaw
parent b49b71ae19
commit 78bcdeb6a3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
misc/cgo/testcarchive/carchive_test.go
View file

@ -147,7 +147,11 @@ func TestInstall(t *testing.T) {
t.Fatal(err)
}
compilemain(t, filepath.Join("pkg", GOOS+"_"+GOARCH, "libgo.a"))
libgopath := filepath.Join("pkg", GOOS+"_"+GOARCH, "libgo.a")
if GOOS == "darwin" && GOARCH == "arm" {
libgopath = filepath.Join("pkg", GOOS+"_"+GOARCH+"_shared", "libgo.a")
}
compilemain(t, libgopath)
binArgs := append(bin, "arg1", "arg2")
if out, err := exec.Command(binArgs[0], binArgs[1:]...).CombinedOutput(); err != nil {