test/bench/shootout: update post-Makefile

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5696054

diff --git a/test/bench/shootout/Makefile b/test/bench/shootout/Makefile
deleted file mode 100644 (file)
index e1c9b7b..0000000
--- a/test/bench/shootout/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../src/Make.inc
-
-all:
-       @echo "make clean or timing"
-
-timing:
-       ./timing.sh
-
-clean:
-       rm -f [568].out *.[568]

diff --git a/test/bench/shootout/timing.sh b/test/bench/shootout/timing.sh
index 3e190e15c83c3cd937c7fd1d9932a32dfb34ff82..dd3e664f4c64c2d5652336a6300141f2f498ea51 100755 (executable)
--- a/test/bench/shootout/timing.sh
+++ b/test/bench/shootout/timing.sh
@@ -5,7 +5,11 @@
 
 set -e
 
-eval $(gomake --no-print-directory -f ../../../src/Make.inc go-env)
+eval $(go tool dist env)
+O=$GOCHAR
+GC="go tool ${O}g"
+LD="go tool ${O}l"
+
 PATH=.:$PATH
 
 havegccgo=false