diff options
Diffstat (limited to 'mk/sys')
| -rw-r--r-- | mk/sys/AIX.mk | 8 | ||||
| -rw-r--r-- | mk/sys/Darwin.mk | 4 | ||||
| -rw-r--r-- | mk/sys/Generic.mk | 8 | ||||
| -rw-r--r-- | mk/sys/HP-UX.mk | 10 | ||||
| -rw-r--r-- | mk/sys/IRIX.mk | 4 | ||||
| -rw-r--r-- | mk/sys/Linux.mk | 6 | ||||
| -rw-r--r-- | mk/sys/NetBSD.mk | 4 | ||||
| -rw-r--r-- | mk/sys/OSF1.mk | 6 | ||||
| -rw-r--r-- | mk/sys/OpenBSD.mk | 6 | ||||
| -rw-r--r-- | mk/sys/SunOS.mk | 4 | ||||
| -rw-r--r-- | mk/sys/UnixWare.mk | 4 |
11 files changed, 32 insertions, 32 deletions
diff --git a/mk/sys/AIX.mk b/mk/sys/AIX.mk index b848d99fb4e8b..d591385be6031 100644 --- a/mk/sys/AIX.mk +++ b/mk/sys/AIX.mk @@ -28,9 +28,9 @@ CC ?= gcc DBG ?= -O -g STATIC ?= -static .else -CC ?= cc +CC ?= cc DBG ?= -g -STATIC ?= +STATIC ?= .endif CFLAGS ?= ${DBG} COMPILE.c ?= ${CC} ${CFLAGS} ${CPPFLAGS} -c @@ -138,7 +138,7 @@ ${CXX_SUFFIXES:%=%.a}: .s: ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} .s.o: - ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} + ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} .s.a: ${COMPILE.s} ${.IMPSRC} ${AR} ${ARFLAGS} $@ $*.o @@ -162,7 +162,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/Darwin.mk b/mk/sys/Darwin.mk index ea04b416ff3a0..06918a11a4ad5 100644 --- a/mk/sys/Darwin.mk +++ b/mk/sys/Darwin.mk @@ -176,7 +176,7 @@ ${CXX_SUFFIXES:%=%.a}: .s: ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} .s.o: - ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} + ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} .s.a: ${COMPILE.s} ${.IMPSRC} ${AR} ${ARFLAGS} $@ $*.o @@ -200,7 +200,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/Generic.mk b/mk/sys/Generic.mk index 9a3d3bffc1838..51c72990f2eae 100644 --- a/mk/sys/Generic.mk +++ b/mk/sys/Generic.mk @@ -1,4 +1,4 @@ -# $Id: Generic.mk,v 1.16 2020/06/29 14:34:42 sjg Exp $ +# $Id: Generic.mk,v 1.17 2020/08/19 17:51:53 sjg Exp $ # # some reasonable defaults @@ -31,7 +31,7 @@ ARFLAGS ?= rl AS ?= as AFLAGS ?= -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" AFLAGS+= -Wa,-Av9a .endif COMPILE.s ?= ${CC} ${AFLAGS} -c @@ -56,7 +56,7 @@ COMPILE.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} CPP ?= cpp -CPPFLAGS ?= +CPPFLAGS ?= FC ?= f77 FFLAGS ?= -O @@ -181,7 +181,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/HP-UX.mk b/mk/sys/HP-UX.mk index 34dd2881d83d3..f1c23148c186e 100644 --- a/mk/sys/HP-UX.mk +++ b/mk/sys/HP-UX.mk @@ -1,4 +1,4 @@ -# $Id: HP-UX.mk,v 1.14 2020/06/29 14:34:42 sjg Exp $ +# $Id: HP-UX.mk,v 1.15 2020/08/19 17:51:53 sjg Exp $ # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -8,7 +8,7 @@ unix ?= We run ${OS}. # HP-UX's cc does not provide any clues as to wether this is 9.x or 10.x # nor does sys/param.h, so we'll use the existence of /hp-ux -.if exists("/hp-ux") +.if exists("/hp-ux") OSMAJOR ?=9 .endif OSMAJOR ?=10 @@ -60,7 +60,7 @@ PICFLAG ?= +z LD_x= DBG ?=-g -O .endif -DBG ?= +DBG ?= STATIC ?= -Wl,-a,archive .endif .if (${__HPUX_VERSION} == "10") @@ -180,7 +180,7 @@ ${CXX_SUFFIXES:%=%.a}: .s: ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} .s.o: - ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} + ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} .s.a: ${COMPILE.s} ${.IMPSRC} ${AR} ${ARFLAGS} $@ $*.o @@ -204,7 +204,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/IRIX.mk b/mk/sys/IRIX.mk index a194c1e78a111..00af15027f6ef 100644 --- a/mk/sys/IRIX.mk +++ b/mk/sys/IRIX.mk @@ -44,7 +44,7 @@ COMPILE.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} CPP ?= CC -CPPFLAGS ?= +CPPFLAGS ?= FC ?= f77 FFLAGS ?= -O @@ -173,7 +173,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/Linux.mk b/mk/sys/Linux.mk index bf80bb3addce9..3cdc4dbe1a623 100644 --- a/mk/sys/Linux.mk +++ b/mk/sys/Linux.mk @@ -1,4 +1,4 @@ -# $Id: Linux.mk,v 1.12 2020/06/29 14:34:42 sjg Exp $ +# $Id: Linux.mk,v 1.13 2020/08/19 17:51:53 sjg Exp $ # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -141,7 +141,7 @@ ${CXX_SUFFIXES:%=%.a}: .s: ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} .s.o: - ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} + ${COMPILE.s} -o ${.TARGET} ${.IMPSRC} .s.a: ${COMPILE.s} ${.IMPSRC} ${AR} ${ARFLAGS} $@ $*.o @@ -165,7 +165,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/NetBSD.mk b/mk/sys/NetBSD.mk index 2e72cc742e4fa..6629a4445a2eb 100644 --- a/mk/sys/NetBSD.mk +++ b/mk/sys/NetBSD.mk @@ -79,7 +79,7 @@ COMPILE.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} CPP ?= cpp -CPPFLAGS ?= +CPPFLAGS ?= FC ?= f77 FFLAGS ?= -O @@ -208,7 +208,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/OSF1.mk b/mk/sys/OSF1.mk index 4c1a09f6f5f70..88e0ea28b930e 100644 --- a/mk/sys/OSF1.mk +++ b/mk/sys/OSF1.mk @@ -1,4 +1,4 @@ -# $Id: OSF1.mk,v 1.11 2020/06/29 14:34:42 sjg Exp $ +# $Id: OSF1.mk,v 1.12 2020/08/19 17:51:53 sjg Exp $ # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -31,7 +31,7 @@ LINK.s ?= ${CC} ${AFLAGS} ${LDFLAGS} COMPILE.S ?= ${CC} ${AFLAGS} ${CPPFLAGS} -c LINK.S ?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS} .if exists(/opt/gnu/bin/gcc) || exists(/usr/local/bin/gcc) -CC ?= gcc +CC ?= gcc .else CC ?= cc -std .endif @@ -176,7 +176,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/OpenBSD.mk b/mk/sys/OpenBSD.mk index d73bb0d82c9a1..7440a231e3bf0 100644 --- a/mk/sys/OpenBSD.mk +++ b/mk/sys/OpenBSD.mk @@ -21,7 +21,7 @@ RANLIB ?= ranlib AS ?= as AFLAGS ?= -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" AFLAGS+= -Wa,-Av9a .endif COMPILE.s ?= ${CC} ${AFLAGS} -c @@ -54,7 +54,7 @@ COMPILE.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m ?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} CPP ?= cpp -CPPFLAGS ?= +CPPFLAGS ?= FC ?= f77 FFLAGS ?= -O @@ -183,7 +183,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/SunOS.mk b/mk/sys/SunOS.mk index e79cd3a7dbd4e..4369c8d43b937 100644 --- a/mk/sys/SunOS.mk +++ b/mk/sys/SunOS.mk @@ -1,4 +1,4 @@ -# $Id: SunOS.mk,v 1.11 2020/06/29 14:34:42 sjg Exp $ +# $Id: SunOS.mk,v 1.12 2020/08/19 17:51:53 sjg Exp $ .if ${.PARSEFILE} == "sys.mk" .include <host-target.mk> @@ -197,7 +197,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc diff --git a/mk/sys/UnixWare.mk b/mk/sys/UnixWare.mk index 888f0d90c0b4e..272d3e65c2d8d 100644 --- a/mk/sys/UnixWare.mk +++ b/mk/sys/UnixWare.mk @@ -1,4 +1,4 @@ -# $Id: UnixWare.mk,v 1.6 2020/06/29 14:34:42 sjg Exp $ +# $Id: UnixWare.mk,v 1.7 2020/08/19 17:51:53 sjg Exp $ # based on "Id: SunOS.5.sys.mk,v 1.6 2003/09/30 16:42:23 sjg Exp " # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -219,7 +219,7 @@ ${CXX_SUFFIXES:%=%.a}: mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc |
