build: fix on Linux

On other systems the temporary directory name
will have a .XXXXXX in the middle of it.  Oh well.

R=bradfitz
CC=golang-dev
https://golang.org/cl/5504049

diff --git a/src/buildscript.sh b/src/buildscript.sh
index e6fec6c39ed43f0b24a0ab574cce579f6e36f204..b61be731ffb254c41b3e724ab417bf2fafa00cec 100755 (executable)
--- a/src/buildscript.sh
+++ b/src/buildscript.sh
@@ -19,7 +19,7 @@ do
 
 export GOOS='$GOOS'
 export GOARCH='$GOARCH'
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_darwin_386.sh b/src/buildscript_darwin_386.sh
index 61f68dd38ff3a486a1512bfd8ab1d23f11a358ce..ae4eb45867be1cec9245f706ae7da6998e6adfe7 100755 (executable)
--- a/src/buildscript_darwin_386.sh
+++ b/src/buildscript_darwin_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=darwin
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_darwin_amd64.sh b/src/buildscript_darwin_amd64.sh
index 3f6a183b0444c31038a8a3ef5106b710a1af6266..06d7dbe00fef811ad8028ed45afd61d930901c94 100755 (executable)
--- a/src/buildscript_darwin_amd64.sh
+++ b/src/buildscript_darwin_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=darwin
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_freebsd_386.sh b/src/buildscript_freebsd_386.sh
index c026051253b9e1968c58f618cd94bf65076fc5f1..3026508e955aae83a9062d2633cc45af5c48645a 100755 (executable)
--- a/src/buildscript_freebsd_386.sh
+++ b/src/buildscript_freebsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=freebsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_freebsd_amd64.sh b/src/buildscript_freebsd_amd64.sh
index a811bb06909726463001eb4c1f5bf8564231cc5d..955317252e8bd2dc8cb9f856486a33ef6cee2425 100755 (executable)
--- a/src/buildscript_freebsd_amd64.sh
+++ b/src/buildscript_freebsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=freebsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_linux_386.sh b/src/buildscript_linux_386.sh
index b17242f19ba72accb27025c59bc07f5042e3b004..69bc6371e661e810d32aa68d059296ba04fe111e 100755 (executable)
--- a/src/buildscript_linux_386.sh
+++ b/src/buildscript_linux_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_linux_amd64.sh b/src/buildscript_linux_amd64.sh
index 46cbd3a6825ccc38358721a548b447507502c5b1..22da2326c67e13901369a3ed9b408cb67a62ba5a 100755 (executable)
--- a/src/buildscript_linux_amd64.sh
+++ b/src/buildscript_linux_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_linux_arm.sh b/src/buildscript_linux_arm.sh
index e61abfa23011068816e30546ef4a7a7a6edb51f3..d5b9550375a240fad4599771c7dd9721211b6226 100755 (executable)
--- a/src/buildscript_linux_arm.sh
+++ b/src/buildscript_linux_arm.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=arm
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_netbsd_386.sh b/src/buildscript_netbsd_386.sh
index dcd90db57b10528ce75382c7507bcde7304551f5..79cca22052782d32c0a8703c4fa0693424c0d159 100755 (executable)
--- a/src/buildscript_netbsd_386.sh
+++ b/src/buildscript_netbsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=netbsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_netbsd_amd64.sh b/src/buildscript_netbsd_amd64.sh
index a5b52acf87a40fec51ee62447ef4e59d27de4b40..5a5637e5c8ecefd4244034f4fa36e78313364819 100755 (executable)
--- a/src/buildscript_netbsd_amd64.sh
+++ b/src/buildscript_netbsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=netbsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_openbsd_386.sh b/src/buildscript_openbsd_386.sh
index 39bc0cbad4c6882c5343988003534a487c1f6d06..967d23f6b5df83713d18183f902440da42f98fa8 100755 (executable)
--- a/src/buildscript_openbsd_386.sh
+++ b/src/buildscript_openbsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=openbsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_openbsd_amd64.sh b/src/buildscript_openbsd_amd64.sh
index 2b9984f005a2f27c540e532719a9d809a6097406..a988738bc5ac022bf4b48e64ee407c15d6b56755 100755 (executable)
--- a/src/buildscript_openbsd_amd64.sh
+++ b/src/buildscript_openbsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=openbsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_plan9_386.sh b/src/buildscript_plan9_386.sh
index 78b894ce71ff0f961d0b623f692899ee59fe7bfb..1fb2cb272b8b23a834238993a53f2861a68d06c2 100755 (executable)
--- a/src/buildscript_plan9_386.sh
+++ b/src/buildscript_plan9_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=plan9
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_windows_386.sh b/src/buildscript_windows_386.sh
index b7602c0919e4c6c318569f454b2090061bdd8eed..f65e60e697dd77eade0e1c71a73bf8abedd1e021 100755 (executable)
--- a/src/buildscript_windows_386.sh
+++ b/src/buildscript_windows_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=windows
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 

diff --git a/src/buildscript_windows_amd64.sh b/src/buildscript_windows_amd64.sh
index c15e9efdc3e93cf6195e96a360ba1659552d008c..5e5c25edb597d53908e5aa9a0dd4490e934bc8b5 100755 (executable)
--- a/src/buildscript_windows_amd64.sh
+++ b/src/buildscript_windows_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=windows
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e