From: miod <miod@openbsd.org>
Date: Fri, 29 Mar 2024 06:52:50 +0000 (+0000)
Subject: No longer build the objective-C compiler (cc1obj). Its standard library
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bdfcf93e4400457de37c6fd07ecee71677f6f18e;p=openbsd

No longer build the objective-C compiler (cc1obj). Its standard library
(libobjc) had been removed from the build years ago, there is no need to
keep the compiler.
ok beck@ joshua@
---

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 170ad2f1222..008284a545a 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.41.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.3 2017/07/24 19:23:57 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2024/03/29 06:52:50 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -13,7 +13,6 @@ SUBDIR+= cpp
 .endif
 
 SUBDIR+= cc1plus c++ c++filt
-SUBDIR+= cc1obj
 SUBDIR+= gcov
 SUBDIR+= libgcc
 SUBDIR+= libgcov
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
deleted file mode 100644
index 8b6d97a459f..00000000000
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.28.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
-
-.include <bsd.own.mk>
-
-.include "${.CURDIR}/../Makefile.inc"
-.include "${.CURDIR}/../Makefile.ver"
-
-.PATH: ${GCCDIR}/objc ${GCCDIR}
-
-PROG=	cc1obj
-SRCS=	main.c c-parser.c objc-act.c objc-lang.c c-decl.c
-BINDIR= /usr/lib/gcc-lib/${GCC_TARGET}/${BASEVER}
-NOMAN=	Yes
-NO_PIC=	Yes
-
-CFLAGS+= -I${GCCDIR}/objc -I.
-
-OBJS+=  ${PROG}-checksum.o
-DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
-LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
-
-DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
-${PROG}-dummy:	${DOBJS}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
-CLEANFILES+=	${PROG}-dummy
-
-${PROG}-checksum.c:	${PROG}-dummy
-	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
-CLEANFILES+=	${PROG}-checksum.c
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 768d8b4d20d..731d943ad63 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.68 2017/10/29 12:42:11 aoyama Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.69 2024/03/29 06:52:50 miod Exp $
 
 MAN=		gcc.1 cpp.1 gcov.1
 
@@ -6,7 +6,7 @@ BINDIR=/usr/bin
 .if defined(BOOTSTRAP)
 LANGUAGES=--enable-languages=c
 .else
-LANGUAGES=--enable-languages='c,c++,objc' 
+LANGUAGES=--enable-languages='c,c++' 
 .endif
 V=3.3.6
 
@@ -29,7 +29,7 @@ MAKE_FLAGS= 	CFLAGS="${GNUCFLAGS}" \
 GXX_INCDIR=	/usr/include/g++
 CLEANFILES=	.gdbinit */.gdbinit *.info* \
 		c-parse.c c-parse.h c-parse.y cexp.c cp/parse.c cp/parse.h \
-		f/*.info* objc/objc-parse.c objc/objc-parse.y target_path \
+		target_path \
 		print-rtl1.c gengtype-lex.c gengtype-yacc.c gengtype-yacc.h \
 		genrtl.c genrtl.h fixinc.sh fixinc/Makefile \
 		po/Makefile  po/Makefile.in  po/POTFILES