Decouple genassym flags from CFLAGS.

Submitted by:	jhay
This commit is contained in:
Jordan K. Hubbard 1998-09-14 11:32:17 +00:00
parent cde2c8b084
commit ac80870e0b
3 changed files with 18 additions and 9 deletions

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes. # Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $ # $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Use the system default for genassym
GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Select the correct set of tools. Can't set OBJFORMAT here because it # Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment. # doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf" .if ${KERNFORMAT} == "elf"
@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s ./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c genassym.o: ${I386}/i386/genassym.c
${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o genassym: genassym.o
${CC} ${CFLAGS} genassym.o -o ${.TARGET} ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h ${SYSTEM_OBJS}: opt_global.h

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes. # Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $ # $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Use the system default for genassym
GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Select the correct set of tools. Can't set OBJFORMAT here because it # Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment. # doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf" .if ${KERNFORMAT} == "elf"
@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s ./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c genassym.o: ${I386}/i386/genassym.c
${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o genassym: genassym.o
${CC} ${CFLAGS} genassym.o -o ${.TARGET} ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h ${SYSTEM_OBJS}: opt_global.h

View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes. # Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $ # $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Use the system default for genassym
GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
# Select the correct set of tools. Can't set OBJFORMAT here because it # Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment. # doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf" .if ${KERNFORMAT} == "elf"
@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s ./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c genassym.o: ${I386}/i386/genassym.c
${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o genassym: genassym.o
${CC} ${CFLAGS} genassym.o -o ${.TARGET} ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h ${SYSTEM_OBJS}: opt_global.h