From 6f1537dd90f61675e9fd05efb6a9bfc20cfe4b77 Mon Sep 17 00:00:00 2001 From: Paul Richards Date: Tue, 23 Aug 1994 17:18:58 +0000 Subject: [PATCH] Fixed up everything so that the version of gcc that we install from the FreeBSD system sources installs itself as the standard cc and c++. I've fixed c++ to call cc instead of gcc and removed all the symlinks that get created to g** version of the binaries. This means that you can install a second version of gcc that does use the g prefix alongside the "system" version of gcc. The only conflict is libgcc but since we install it as libcc.so.26 and nothing else is likely to that should be ok. Reviewed by: Submitted by: --- gnu/usr.bin/cc/Makefile.inc | 1 + gnu/usr.bin/cc/cc/Makefile | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 95525cbae5f..39ae7e7638b 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -9,3 +9,4 @@ CFLAGS+= -DDEFAULT_TARGET_VERSION=\"2.6.0\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"i386--freebsd\" CFLAGS+= -DMD_EXEC_PREFIX=\"/usr/libexec/\" CFLAGS+= -DSTANDARD_STARTFILE_PREFIX=\"/usr/lib\" +CFLAGS+= -DGCC_NAME=\"cc\" diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile index f95615bea90..dc503abef84 100644 --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -5,14 +5,8 @@ PROG = cc SRCS = gcc.c BINDIR= /usr/bin -MLINKS+=cc.1 gcc.1 -MLINKS+=cc.1 c++.1 -MLINKS+=cc.1 g++.1 LDDESTDIR+= -L${.CURDIR}/../cc_int/obj LDDESTDIR+= -L${.CURDIR}/../cc_int LDADD+= -lcc_int -afterinstall: - cd $(DESTDIR)$(BINDIR) ; rm -f gcc ; ln -s cc gcc - .include