From fd4767f2c5328a14b50874ad3a25518c673ccd12 Mon Sep 17 00:00:00 2001
From: Rob Pike <r@golang.org>
Date: Tue, 13 Oct 2009 12:37:28 -0700
Subject: [PATCH] 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
---
src/cmd/clean.bash | 2 +-
src/cmd/{ar => gopack}/Makefile | 4 ----
src/cmd/{ar => gopack}/ar.c | 0
src/cmd/make.bash | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
rename src/cmd/{ar => gopack}/Makefile (67%)
rename src/cmd/{ar => gopack}/ar.c (100%)
diff --git a/src/cmd/clean.bash b/src/cmd/clean.bash
index 8432c9f22bb..f6863281051 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
similarity index 67%
rename from src/cmd/ar/Makefile
rename to src/cmd/gopack/Makefile
index cbed2617d88..d95c9dd9d65 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
similarity index 100%
rename from src/cmd/ar/ar.c
rename to src/cmd/gopack/ar.c
diff --git a/src/cmd/make.bash b/src/cmd/make.bash
index ca4517218e3..25bcd38e798 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
--
GitLab