From aafe474ec9af1e0e8677df3eac3ef2c92fb946e9 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 24 Aug 2010 20:00:33 -0400 Subject: build: $GOBIN defaults to $GOROOT/bin R=r CC=golang-dev https://golang.org/cl/1982049 --- src/cmd/nm/Makefile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/cmd/nm/Makefile') diff --git a/src/cmd/nm/Makefile b/src/cmd/nm/Makefile index bb15451222..383dbd973c 100644 --- a/src/cmd/nm/Makefile +++ b/src/cmd/nm/Makefile @@ -2,23 +2,17 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -include ../../Make.conf +include ../../Make.inc +O:=$(HOST_O) # The directory is nm because the source is portable and general. -# We call the binary 6nm to avoid confusion and because this binary -# is linked only with amd64 and x86 support. +# We call the binary 6nm to avoid confusion with the host nm. TARG=6nm OFILES=\ nm.$O\ -$(TARG): $(OFILES) - $(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lmach -lbio -l9 +LIB=\ + ../../../lib/libmach.a\ -clean: - rm -f *.$O $(TARG) - -install: $(TARG) - cp $(TARG) "$(GOBIN)"/$(TARG) - -$(OFILES): $(HFILES) +include ../../Make.ccmd -- cgit v1.3-5-g45d5