From 78bcdeb6a36a6d45f93c8ff546fa946e5fbec093 Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Wed, 27 Apr 2016 15:44:22 -0400 Subject: [PATCH] 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 Run-TryBot: David Crawshaw TryBot-Result: Gobot Gobot --- misc/cgo/testcarchive/carchive_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/misc/cgo/testcarchive/carchive_test.go b/misc/cgo/testcarchive/carchive_test.go index 72e9ef1d591..19c746d49a5 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 {