diff options
| author | Cherry Zhang <cherryyz@google.com> | 2016-04-27 15:44:22 -0400 |
|---|---|---|
| committer | David Crawshaw <crawshaw@golang.org> | 2016-04-27 20:07:12 +0000 |
| commit | 78bcdeb6a36a6d45f93c8ff546fa946e5fbec093 (patch) | |
| tree | 877aaf237f22cf134bcbb12f2125b61fc5a9ee31 | |
| parent | b49b71ae192c72faf699edd321ff0637f90e794c (diff) | |
| download | go-78bcdeb6a36a6d45f93c8ff546fa946e5fbec093.tar.xz | |
misc/cgo/testcarchive: fix path of libgo.a for darwin/arm
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>
| -rw-r--r-- | misc/cgo/testcarchive/carchive_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/misc/cgo/testcarchive/carchive_test.go b/misc/cgo/testcarchive/carchive_test.go index 72e9ef1d59..19c746d49a 100644 --- a/misc/cgo/testcarchive/carchive_test.go +++ b/misc/cgo/testcarchive/carchive_test.go @@ -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 { |