1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-28 11:57:28 +00:00

Take __FreeBSD_version into account when BOOTSTRAPPING.

This commit is contained in:
Ruslan Ermilov 2002-11-13 13:49:29 +00:00
parent b448dd2f9e
commit 40c6b893d8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=106852
8 changed files with 28 additions and 18 deletions

View File

@ -123,6 +123,7 @@ SUPFLAGS+= -h ${SUPHOST}
.endif
MAKEOBJDIRPREFIX?= /usr/obj
OSRELDATE!= sysctl -n kern.osreldate
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
@ -193,7 +194,8 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
BOOTSTRAPPING=${OSRELDATE} \
-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
@ -201,8 +203,8 @@ BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
-DNO_CPU_CFLAGS
TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \
BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS
# cross-tool stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB

View File

@ -10,7 +10,9 @@ SRCS= argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \
hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \
objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \
xstrdup.c xstrerror.c
.if defined(BOOTSTRAPPING)
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 440000 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 ))
SRCS+= basename.c
.endif
WARNS= 1

View File

@ -106,7 +106,9 @@ asn1_compile: \
strupr.c
${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
.if defined(BOOTSTRAPPING)
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 440001 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 ))
asn1_compile: getprogname.c setprogname.c
.endif

View File

@ -61,7 +61,9 @@ asn1_compile: parse.o lex.o main.c hash.c symbol.c emalloc.c gen.c \
get_window_size.c strupr.c
${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
.if defined(BOOTSTRAPPING)
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 440001 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 ))
asn1_compile: getprogname.c setprogname.c
.endif

View File

@ -55,7 +55,9 @@ CFLAGS += -Werror
# Allow user-specified additional warning flags
CFLAGS += ${CWARNFLAGS}
# FreeBSD prior to 4.5 didn't have the __FBSDID() macro in <sys/cdefs.h>.
.if defined(BOOTSTRAPPING)
# FreeBSD didn't always have the __FBSDID() macro in <sys/cdefs.h>.
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 440001 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500024 ))
CFLAGS+= -D__FBSDID=__RCSID
.endif

View File

@ -5,8 +5,4 @@ PROG= xargs
SRCS= xargs.c strnsubst.c
WARNS?= 4
.if defined(BOOTSTRAPPING)
CFLAGS+=-DBOOTSTRAPPING
.endif
.include <bsd.prog.mk>

View File

@ -51,12 +51,13 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/wait.h>
#include <err.h>
#include <errno.h>
#ifndef BOOTSTRAPPING
#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \
__FreeBSD_version >= 500017
#include <langinfo.h>
#endif
#include <locale.h>
@ -542,10 +543,11 @@ prompt(void)
(void)fflush(stderr);
if ((response = fgetln(ttyfp, &rsize)) == NULL ||
regcomp(&cre,
#ifdef BOOTSTRAPPING
"^[yY]",
#else
#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \
__FreeBSD_version >= 500017
nl_langinfo(YESEXPR),
#else
"^[yY]",
#endif
REG_BASIC) != 0) {
(void)fclose(ttyfp);

View File

@ -6,7 +6,9 @@ PROGNAME= install
SRCS= xinstall.c
MAN= install.1
.if defined(BOOTSTRAPPING)
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 400021 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500007 ))
.PATH: ${.CURDIR}/../../lib/libc/gen
SRCS+= strtofflags.c
.endif