leave 6.out around after gotest;

delete it in make clean.

R=r
DELTA=10  (0 added, 0 deleted, 10 changed)
OCL=19542
CL=19581

diff --git a/src/cmd/gobuild/gobuild.c b/src/cmd/gobuild/gobuild.c
index 6605b05265b9d1f1d13967c58140a96cd14c7943..f0ba6f67190580ed3dabaf13a6725df2240bc946 100644 (file)
--- a/src/cmd/gobuild/gobuild.c
+++ b/src/cmd/gobuild/gobuild.c
@@ -280,7 +280,7 @@ char preamble[] =
        "default: packages\n"
        "\n"
        "clean:\n"
-       "\trm -f *.$O *.a\n"
+       "\trm -f *.$O *.a $O.out\n"
        "\n"
        "test: packages\n"
        "\tgotest\n"

diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest
index 1980dc685021d7e2c87c3362d16df66fb0f24648..85699547beeaed00835d9ee16060fbee86c32a95 100755 (executable)
--- a/src/cmd/gotest/gotest
+++ b/src/cmd/gotest/gotest
@@ -41,7 +41,7 @@ done
 set -e
 
 # They all compile; now generate the code to call them.
-trap "rm -f _testmain.go _testmain.6 6.out" 0 1 2 3 14 15
+trap "rm -f _testmain.go _testmain.6" 0 1 2 3 14 15
 {
        # package spec
        echo 'package main'

diff --git a/src/lib/fmt/Makefile b/src/lib/fmt/Makefile
index 03fdff84c048f7644619f541d28efe7a65fe46d1..bdef02d698b97a12acce209762fa431d5cf368cc 100644 (file)
--- a/src/lib/fmt/Makefile
+++ b/src/lib/fmt/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/http/Makefile b/src/lib/http/Makefile
index 75ab68d7de54be9f3f556067ee85fa8217a5f8c7..0827008f97acb651c24eb66ad53ce7e2fa9ab319 100644 (file)
--- a/src/lib/http/Makefile
+++ b/src/lib/http/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/math/Makefile b/src/lib/math/Makefile
index 56cd9d0466d2c8af3bd7072cccb2b4918f8359cf..d5318a60a57c7cecdb5ab38f74f914974f121a45 100644 (file)
--- a/src/lib/math/Makefile
+++ b/src/lib/math/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/net/Makefile b/src/lib/net/Makefile
index 52ff320e4725d6c3423d61891ca367a79d0ca3b4..1670e5ac305dea3164e0ffb36d16005fa8c7df05 100644 (file)
--- a/src/lib/net/Makefile
+++ b/src/lib/net/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/os/Makefile b/src/lib/os/Makefile
index ed4a36bbbbc7b1a3aa247eae1abccabf53851cf7..d359b232e039cff2efb6ca9d4213e2c7da3eb646 100644 (file)
--- a/src/lib/os/Makefile
+++ b/src/lib/os/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/reflect/Makefile b/src/lib/reflect/Makefile
index 729a819864ce4f9e10ca096ff72d0be13fbd6bf8..90aadda42f14fe1c5767e4d86b2565d2f1225fe4 100644 (file)
--- a/src/lib/reflect/Makefile
+++ b/src/lib/reflect/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/strconv/Makefile b/src/lib/strconv/Makefile
index e5c4d1d1d9992f295b063c06140ce4f4ecd57e3e..6718dc3f5929f0a72132e4d2fe6ba3104eb7d4b3 100644 (file)
--- a/src/lib/strconv/Makefile
+++ b/src/lib/strconv/Makefile
@@ -13,7 +13,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest

diff --git a/src/lib/syscall/Makefile b/src/lib/syscall/Makefile
index 58d483a9d53f1c61c7d726dd91ed20655950882b..a35be213a313a698f3514175faa9958be201bab3 100644 (file)
--- a/src/lib/syscall/Makefile
+++ b/src/lib/syscall/Makefile
@@ -15,7 +15,7 @@ AR=$(O)ar
 default: packages
 
 clean:
-       rm -f *.$O *.a
+       rm -f *.$O *.a $O.out
 
 test: packages
        gotest