Module Name: src
Committed By: lukem
Date: Wed May 24 10:07:16 UTC 2023
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
deprecate SHAREDSTRINGS build option
Hasn't worked for at least 20 years (and never in the cross-build environment,
nor did it work with parallel make), and has never been needed in NetBSD as we
don't have the older BSD programs (pascal, pre-nvi ex) that needed mkstr/xstr
on PDP-11.
PR toolchain/35964
To generate a diff of this commit:
cvs rdiff -u -r1.442 -r1.443 src/share/mk/bsd.README
cvs rdiff -u -r1.343 -r1.344 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.442 src/share/mk/bsd.README:1.443
--- src/share/mk/bsd.README:1.442 Sat Oct 1 08:55:45 2022
+++ src/share/mk/bsd.README Wed May 24 10:07:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.442 2022/10/01 08:55:45 rillig Exp $
+# $NetBSD: bsd.README,v 1.443 2023/05/24 10:07:16 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1832,10 +1832,6 @@ DPADD Additional dependencies for the p
LIBXXF86MISC?= ${DESTDIR}/usr/X11R7/lib/libXxf86misc.a
LIBXXF86VM?= ${DESTDIR}/usr/X11R7/lib/libXxf86vm.a
-SHAREDSTRINGS If defined, a new .c.o rule is used that results in shared
- strings, using xstr(1). Note that this will not work with
- parallel makes.
-
STRIPFLAG The flag passed to the install program to cause the binary
to be stripped.
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.343 src/share/mk/bsd.prog.mk:1.344
--- src/share/mk/bsd.prog.mk:1.343 Mon May 8 14:31:08 2023
+++ src/share/mk/bsd.prog.mk Wed May 24 10:07:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.343 2023/05/08 14:31:08 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.344 2023/05/24 10:07:16 lukem Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -35,22 +35,6 @@ realinstall: proginstall scriptsinstall
CLEANFILES+= a.out [Ee]rrs mklog core *.core .gdbinit
-.if defined(SHAREDSTRINGS)
-CLEANFILES+=strings
-.c.o:
- ${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
- @${CC} ${CPPFLAGS} ${CFLAGS} -c x.c ${OBJECT_TARGET}
- ${CTFCONVERT_RUN}
- @rm -f x.c
-
-.cc.o .cpp.o .cxx.o .C.o:
- ${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
- @${MV} x.c x.cc
- @${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc ${OBJECT_TARGET}
- ${CTFCONVERT_RUN}
- @rm -f x.cc
-.endif
-
.if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
CFLAGS+= ${PIE_CFLAGS}
AFLAGS+= ${PIE_AFLAGS}
