diff options
| author | kn <kn@cvs.openbsd.org> | 2021-07-26 12:47:48 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2021-07-26 12:47:48 +0000 |
| commit | 6cc79f68089a7db02ffed215bdd098edc274fec5 (patch) | |
| tree | 6b5c9e83a04364707001724b2c04cc11c7f8e3bf /distrib/sparc64 | |
| parent | fbeb36730108f715d613dba2aec63f9310695251 (diff) | |
Pass make flags to kernel and lib builds
Running `make -j4' in /usr/src/distrib/amd64/ramdisk_cd/ et al. executes
make(1) to both build the RAMDISK kernel and build libraries.
Doing so does not propagate the flags specified to the ramdisk_cd
invocation, which in turn means `-j4' for example is ignored and both kernel
and libraries will not be built in parallel.
Pass make(1)'s MFLAGS along to retain relevant flags; make is clever enough
to separate flags, variable assignments and targets from each other and only
pass along things to `MFLAGS' that'd make sense, i.e. `make -C. -j4 foo=bar'
does *not* pass `-C.' to change directories.
(can be easily tested with `make -p ... | grep MFLAGS'.)
This makes hacking on ramdisks/the installer much faster, espescially since
the `bsd' target does `make clean' and therefore builds a new kernel every
time.
OK deraadt
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/miniroot/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index d66d02dcbed..1c9f5a01901 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2021/02/14 17:14:42 semarie Exp $ +# $OpenBSD: Makefile,v 1.28 2021/07/26 12:47:47 kn Exp $ FS= miniroot${OSrev}.img FSSIZE= 6400 @@ -70,7 +70,7 @@ bsd.rd: mr.fs bsd bsd: cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \ - su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}' cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd mr.fs: instbin @@ -88,7 +88,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf -c instbin.c -e instbin -m instbin.mk instbin.conf instbin: instbin.mk instbin.cache instbin.c - ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + ${MAKE} ${MFLAGS} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index cdbff9a2868..93f71ee9e42 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2021/02/14 17:14:42 semarie Exp $ +# $OpenBSD: Makefile,v 1.54 2021/07/26 12:47:47 kn Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -43,7 +43,7 @@ bsd.rd: mr.fs bsd bsd: cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \ - su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}' cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd mr.fs: instbin @@ -61,7 +61,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf -c instbin.c -e instbin -m instbin.mk instbin.conf instbin: instbin.mk instbin.cache instbin.c - ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + ${MAKE} ${MFLAGS} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 5499a067cde..355fb7d2624 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2021/02/14 17:14:42 semarie Exp $ +# $OpenBSD: Makefile,v 1.50 2021/07/26 12:47:47 kn Exp $ FS= floppyB${OSrev}.img FSSIZE= 2880 @@ -43,7 +43,7 @@ bsd.rd: mr.fs bsd bsd: cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \ - su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}' cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd mr.fs: instbin @@ -61,7 +61,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf -c instbin.c -e instbin -m instbin.mk instbin.conf instbin: instbin.mk instbin.cache instbin.c - ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all + ${MAKE} ${MFLAGS} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all instbin.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf |