From 39ff18089a4cdb4c92375680b1f148ab86a589b7 Mon Sep 17 00:00:00 2001 From: bde Date: Wed, 8 Jul 1998 00:14:15 +0000 Subject: Use the installed versions of cc, cc1 and cpp for building underscore. They have been bootstrapped by `make world' since long before the hacks here were cloned from ../libgcc/Makefile. The versions just built in "../*" normally won't work if the target system is not binary compatible. Don't use OBJS to defeat `make depend'; just put generated sources in SRCS. Added temporary files to CLEANFILES. --- gnu/usr.bin/cc/c++filt/Makefile | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) (limited to 'gnu/usr.bin/cc') diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile index 5e801de..34cd99e 100644 --- a/gnu/usr.bin/cc/c++filt/Makefile +++ b/gnu/usr.bin/cc/c++filt/Makefile @@ -1,48 +1,18 @@ # -# $Id$ +# $Id: Makefile,v 1.3 1997/02/22 15:44:50 peter Exp $ # PROG = c++filt -SRCS = cplus-dem.c getopt.c getopt1.c -OBJS+= underscore.o # defeat 'make depend' +SRCS = cplus-dem.c getopt.c getopt1.c underscore.c BINDIR= /usr/bin NOMAN= 1 CFLAGS+= -DMAIN -DIN_GCC -DVERSION=\"$(version)\" - -# -# XXX This is a hack, but it seems to work. libgcc1.a is supposed to be -# compiled by the native compiler, and libgcc2.a is meant to be compiled -# by *this* version of gcc. -# -# Normally, this does not make any difference, since we only have gcc, but -# when bootstrapping from gcc-2.6.3, we have to use the freshly built 2.7.2 -# compiler for some of the libgcc2.c __attribute__ stuff. -# -.if exists(${.OBJDIR}/../cc) -XCC= ${.OBJDIR}/../cc/cc -.else -XCC= ${.CURDIR}/../cc/cc -.endif - -.if exists(${.OBJDIR}/../cc1) -XCC+= -B${.OBJDIR}/../cc1/ -.else -XCC+= -B${.CURDIR}/../cc1/ -.endif - -.if exists(${.OBJDIR}/../cpp) -XCC+= -B${.OBJDIR}/../cpp/ -.else -XCC+= -B${.CURDIR}/../cpp/ -.endif - -CLEANFILES+= underscore.c -underscore.o: underscore.c +CLEANFILES= tmp-dum.c tmp-dum.s underscore.c underscore.c: echo "int xxy_us_dummy;" >tmp-dum.c - ${XCC} -S tmp-dum.c + ${CC} -S tmp-dum.c echo '/*WARNING: This file is automatically generated!*/' >underscore.c if grep _xxy_us_dummy tmp-dum.s > /dev/null ; then \ echo "int prepends_underscore = 1;" >>underscore.c; \ @@ -52,4 +22,3 @@ underscore.c: rm -f tmp-dum.c tmp-dum.s .include - -- cgit v1.1