build: more adjustments for move from src/pkg to src

These were missed in CL 134570043.

Fixes nacl, solaris builds.

TBR=r
CC=golang-codereviews
https://golang.org/cl/136320043

diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index 89e1e1193a2a5c62d22175b38d2008609fb4209b..fd0c6a035bd0bc9e806f25cfd66b644bc6aac5c9 100644 (file)
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -21,98 +21,97 @@ go  src=..
                        link
                                testdata
                                        +
-               pkg
-                       archive
-                               tar
-                                       testdata
-                                               +
-                               zip
-                                       testdata
-                                               +
-                       compress
-                               bzip2
-                                       testdata
-                                               +
-                               flate
-                               gzip
-                                       testdata
-                                               +
-                               lzw
-                               testdata
-                                       +
-                               zlib
-                       crypto
-                               rsa
-                                       testdata
-                                               +
-                               tls
-                                       testdata
-                                               +
-                       debug
-                               dwarf
-                                       testdata
-                                               +
-                               elf
-                                       testdata
-                                               +
-                               macho
-                                       testdata
-                                               +
-                               pe
-                                       testdata
-                                               +
-                               plan9obj
-                                       testdata
-                                               +
-                       go
-                               build
-                                       +
-                               doc
-                                       testdata
-                                               +
-                               format
-                                       +
-                               parser
-                                       +
-                               printer
-                                       +
-                       image
-                               testdata
-                                       +
-                               draw
-                               gif
-                               jpeg
-                               png
-                                       testdata
-                                               +
-                       io
+               archive
+                       tar
+                               testdata
+                                       +
+                       zip
+                               testdata
+                                       +
+               compress
+                       bzip2
+                               testdata
+                                       +
+                       flate
+                       gzip
+                               testdata
+                                       +
+                       lzw
+                       testdata
                                +
-                       mime
+                       zlib
+               crypto
+                       rsa
+                               testdata
+                                       +
+                       tls
+                               testdata
+                                       +
+               debug
+                       dwarf
+                               testdata
+                                       +
+                       elf
+                               testdata
+                                       +
+                       macho
                                testdata
                                        +
-                               multipart
-                                       testdata
-                                               +
-                       net
-                               http
+                       pe
+                               testdata
                                        +
+                       plan9obj
                                testdata
                                        +
-                       os
+               go
+                       build
                                +
-                       path
-                               filepath
+                       doc
+                               testdata
                                        +
-                       regexp
+                       format
+                               +
+                       parser
+                               +
+                       printer
+                               +
+               image
+                       testdata
+                               +
+                       draw
+                       gif
+                       jpeg
+                       png
                                testdata
                                        +
-                       strconv
+               io
+                       +
+               mime
+                       testdata
+                               +
+                       multipart
+                               testdata
+                                       +
+               net
+                       http
+                               +
+                       testdata
+                               +
+               os
+                       +
+               path
+                       filepath
+                               +
+               regexp
+                       testdata
+                               +
+               strconv
+                       testdata
+                               +
+               text
+                       template
                                testdata
                                        +
-                       text
-                               template
-                                       testdata
-                                               +
        lib
                time
                        zoneinfo.zip

diff --git a/src/nacltest.bash b/src/nacltest.bash
index 154d99ae9827645f300a131ac1d3f15b10a15c6b..6220d39f13d5dc548d493c6095a3b07a0fc6440e 100755 (executable)
--- a/src/nacltest.bash
+++ b/src/nacltest.bash
@@ -72,8 +72,8 @@ export GOROOT=$(pwd)/..
 
 # Build zip file embedded in package syscall.
 gobin=${GOBIN:-$(pwd)/../bin}
-rm -f pkg/syscall/fstest_nacl.go
-GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto pkg/syscall/fstest_nacl.go
+rm -f syscall/fstest_nacl.go
+GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto syscall/fstest_nacl.go
 
 # Run standard build and tests.
 export PATH=$(pwd)/../misc/nacl:$PATH

diff --git a/src/runtime/thunk_solaris_amd64.s b/src/runtime/thunk_solaris_amd64.s
index 352011e047bddba20110c185ba6b63ffb5120c64..f61188c1400a91acf660668b3c02f10c1d829186 100644 (file)
--- a/src/runtime/thunk_solaris_amd64.s
+++ b/src/runtime/thunk_solaris_amd64.s
@@ -5,7 +5,7 @@
 // This file exposes various external library functions to Go code in the runtime.
 
 #include "zasm_GOOS_GOARCH.h"
-#include "../../cmd/ld/textflag.h"
+#include "textflag.h"
 
 TEXT runtime·libc_chdir(SB),NOSPLIT,$0
        MOVQ    libc·chdir(SB), AX