summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-09-21 14:27:38 +0000
committerpeter <peter@FreeBSD.org>1996-09-21 14:27:38 +0000
commite18a0a6953e2a8c190fb6084498890bfc4c09cea (patch)
tree31c1cf5a33f745210c49d777e5b8548791bcca5e /gnu
parent1c908a85b75b81606ddad5806bed35722857d16f (diff)
downloadFreeBSD-src-e18a0a6953e2a8c190fb6084498890bfc4c09cea.zip
FreeBSD-src-e18a0a6953e2a8c190fb6084498890bfc4c09cea.tar.gz
Remove the partial support for a shared -lcc_int, since it's been unusable
for a fair while. cc1, cc1plus etc have been linked static for some time.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libgcc/Makefile4
-rw-r--r--gnu/usr.bin/cc/Makefile.inc8
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile4
-rw-r--r--gnu/usr.bin/cc/cc1obj/Makefile4
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile6
-rw-r--r--gnu/usr.bin/cc/cc_int/Makefile7
-rw-r--r--gnu/usr.bin/cc/libgcc/Makefile4
7 files changed, 15 insertions, 22 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 52cfc0a..4c90056 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,8 +1,10 @@
#
-# $Id: Makefile,v 1.9 1996/05/07 23:15:14 wosch Exp $
+# $Id: Makefile,v 1.11 1996/09/19 15:53:44 peter Exp $
#
LIB= gcc
+
+# Install libgcc_pic.a, since ld.so uses it.
INSTALL_PIC_ARCHIVE= yes
#
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index f54d2f7..9536089 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
#
-# $Id$
+# $Id: Makefile.inc,v 1.15 1996/09/19 15:38:01 peter Exp $
#
# Sometimes this is .include'd several times...
@@ -46,12 +46,6 @@ LIBDESTDIR= ${.OBJDIR}/../cc_int
LIBDESTDIR= ${.CURDIR}/../cc_int
.endif
-# XXX LDDESTDIR isn't a directory and there is no standard name for the dir
-LDDESTDIR= -L${LIBDESTDIR}
-.if defined(SHARED_LIBCC_INT)
-LIBCC_INT= ${LIBDESTDIR}/libcc_int.so.272.0
-.else
LIBCC_INT= ${LIBDESTDIR}/libcc_int.a
-.endif
.endif
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 00c970a..c824c8b 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,5 +1,5 @@
#
-# $Id$
+# $Id: Makefile,v 1.8 1996/09/19 15:38:33 peter Exp $
#
PROG = cc1
@@ -10,6 +10,6 @@ BINDIR= /usr/libexec
NOMAN= 1
NOSHARED= true
DPADD+= ${LIBCC_INT}
-LDADD+= -lcc_int
+LDADD+= ${LIBCC_INT}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 9d7278a..1a0cd7f 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,5 +1,5 @@
#
-# $Id$
+# $Id: Makefile,v 1.1 1996/09/19 15:39:20 peter Exp $
#
PROG = cc1obj
@@ -10,6 +10,6 @@ BINDIR= /usr/libexec
NOMAN= 1
NOSHARED= true
DPADD+= ${LIBCC_INT}
-LDADD+= -lcc_int
+LDADD+= ${LIBCC_INT}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 3641944..b054b8a 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.7 1995/10/02 16:37:16 wollman Exp $
+# $Id: Makefile,v 1.8 1996/09/19 15:39:23 peter Exp $
#
#First, so that we get cp/tree.c and cp/expr.c instead of the C version
@@ -12,9 +12,9 @@ SRCS = parse.c \
ptree.c repo.c search.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
BINDIR= /usr/libexec
NOMAN= 1
-NOSHARED= makes_it_smaller_faster
+NOSHARED= true
DPADD+= ${LIBCC_INT}
-LDADD+= -lcc_int
+LDADD+= ${LIBCC_INT}
CFLAGS+= -I. # I mean it.
parse.c parse.h: parse.y
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 87342c9..2048316 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.8 1995/03/13 01:30:02 ache Exp $
+# $Id: Makefile,v 1.9 1996/09/19 15:42:15 peter Exp $
#
.include "../Makefile.inc"
@@ -19,11 +19,6 @@ SRCS= bc-emit.c bc-optab.c \
LIB= cc_int
NOPROFILE= no thanks
-.if defined(SHARED_LIB_CC_INT)
-INTERNALLIB= no thanks
-SHLIB_MAJOR= 272
-SHLIB_MINOR= 1
-.else
NOPIC= no thanks
install:
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 52cfc0a..4c90056 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,8 +1,10 @@
#
-# $Id: Makefile,v 1.9 1996/05/07 23:15:14 wosch Exp $
+# $Id: Makefile,v 1.11 1996/09/19 15:53:44 peter Exp $
#
LIB= gcc
+
+# Install libgcc_pic.a, since ld.so uses it.
INSTALL_PIC_ARCHIVE= yes
#
OpenPOWER on IntegriCloud