summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2009-10-13 12:37:28 -0700
committerRob Pike <r@golang.org>2009-10-13 12:37:28 -0700
commitf3ea8729fa2cd899a68d2143c56e6a5bea0ba2f5 (patch)
tree9a25ce139f8aba1c014ad41e7fddc72de26a74dc
parent979679431cda09007bb41972386e44dcd25950b9 (diff)
downloadgolang-f3ea8729fa2cd899a68d2143c56e6a5bea0ba2f5.tar.gz
rename the source directory for gopack from ar to gopack.
remove the references to 6ar R=rsc DELTA=3547 (1770 added, 1775 deleted, 2 changed) OCL=35669 CL=35671
-rw-r--r--src/cmd/clean.bash2
-rw-r--r--src/cmd/gopack/Makefile (renamed from src/cmd/ar/Makefile)4
-rw-r--r--src/cmd/gopack/ar.c (renamed from src/cmd/ar/ar.c)0
-rw-r--r--src/cmd/make.bash2
4 files changed, 2 insertions, 6 deletions
diff --git a/src/cmd/clean.bash b/src/cmd/clean.bash
index 8432c9f22..f68632810 100644
--- a/src/cmd/clean.bash
+++ b/src/cmd/clean.bash
@@ -3,7 +3,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g ar db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
+for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g gopack db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
do
cd $i
make clean
diff --git a/src/cmd/ar/Makefile b/src/cmd/gopack/Makefile
index cbed2617d..d95c9dd9d 100644
--- a/src/cmd/ar/Makefile
+++ b/src/cmd/gopack/Makefile
@@ -4,10 +4,6 @@
include ../../Make.conf
-# The directory is ar because the source is portable and general.
-# We call the binary 6ar to avoid confusion and because this binary
-# is linked only with amd64 and x86 support.
-
TARG=gopack
OFILES=\
ar.$O\
diff --git a/src/cmd/ar/ar.c b/src/cmd/gopack/ar.c
index bd8d5f9da..bd8d5f9da 100644
--- a/src/cmd/ar/ar.c
+++ b/src/cmd/gopack/ar.c
diff --git a/src/cmd/make.bash b/src/cmd/make.bash
index ca4517218..25bcd38e7 100644
--- a/src/cmd/make.bash
+++ b/src/cmd/make.bash
@@ -18,7 +18,7 @@ bash mkenam
make enam.o
cd ..
-for i in cc ${O}l ${O}a ${O}c gc ${O}g ar db nm acid cov godefs prof gotest
+for i in cc ${O}l ${O}a ${O}c gc ${O}g gopack db nm acid cov godefs prof gotest
do
echo; echo; echo %%%% making $i %%%%; echo
cd $i