From 044c7b32d0671b0585f1ac2e348e3ddb68bd630e Mon Sep 17 00:00:00 2001 From: mpl Date: Tue, 10 May 2016 00:57:46 +0200 Subject: [PATCH] make.go: mirror assembly code too pkg/fs/fs_test.go depends on bazil.org/fuse/syscallx, which in turn depends on golang.org/x/sys/unix We already had the assembly code vendored in for golang.org/x/sys/unix, but we weren't mirroring it in make.go This didn't show with 'go run make.go' because it only affects a test. And it didn't show with 'go test ./pkg/fs' either, because the assembly would then be found in GOPATH. Only devcam test would detect it. Change-Id: Ibb90a5fb986a3d0308ff9f1f8df8d5866cfec8c5 --- make.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.go b/make.go index ced404903..87e53310f 100644 --- a/make.go +++ b/make.go @@ -78,7 +78,7 @@ var ( // Our temporary source tree root and build dir, i.e: buildGoPath + "src/camlistore.org" buildSrcDir string // files mirrored from camRoot to buildSrcDir - rxMirrored = regexp.MustCompile(`^([a-zA-Z0-9\-\_]+\.(?:blobs|camli|css|eot|err|gif|go|pb\.go|gpg|html|ico|jpg|js|json|xml|min\.css|min\.js|mp3|otf|png|svg|pdf|psd|tiff|ttf|woff|xcf|tar\.gz|gz|tar\.xz|tbz2|zip))$`) + rxMirrored = regexp.MustCompile(`^([a-zA-Z0-9\-\_]+\.(?:blobs|camli|css|eot|err|gif|go|s|pb\.go|gpg|html|ico|jpg|js|json|xml|min\.css|min\.js|mp3|otf|png|svg|pdf|psd|tiff|ttf|woff|xcf|tar\.gz|gz|tar\.xz|tbz2|zip))$`) ) func main() {