diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2016-11-06 16:04:22 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2016-11-06 16:04:22 +0000 |
| commit | 5c44f8f4952e18adebbaf07d838da487fcb65f6c (patch) | |
| tree | af8a04b81ff1b2e3e0a02bebb262f24ed1021583 /sys/arch/sparc64/stand | |
| parent | 524d73769fc251cd985c3a354be4c47f1ec0c692 (diff) | |
Do not create machine@ symlinks in obj as root during includes:, but
defer their creation to later, so that they are owned by BUILDUSER.
This eliminates the last root-owned files in obj/ from 'make build'.
In addition, place a MACHINE == hppa test in hppa/stand/Makefile.inc
to avoid creating bogus symlinks on all other archs.
joint work with & ok natano, "let's try it" deraadt
Diffstat (limited to 'sys/arch/sparc64/stand')
| -rw-r--r-- | sys/arch/sparc64/stand/bootblk/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/libsa/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/ofwboot/Makefile | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile index c5c011e556a..324d5d31fff 100644 --- a/sys/arch/sparc64/stand/bootblk/Makefile +++ b/sys/arch/sparc64/stand/bootblk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2014/07/15 22:14:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2016/11/06 16:04:20 tb Exp $ # $NetBSD: Makefile,v 1.1 2000/08/20 14:58:45 mrg Exp $ CURDIR= ${.CURDIR} @@ -18,7 +18,8 @@ BINMODE=644 INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) +.if !make(clean) && !make(cleandir) && !make(includes) && !make(libdep) && \ + !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: @([ -h machine ] || ln -s ${.CURDIR}/../../include machine) .endif diff --git a/sys/arch/sparc64/stand/libsa/Makefile b/sys/arch/sparc64/stand/libsa/Makefile index a3e6d4126a1..9c7d4a3cf83 100644 --- a/sys/arch/sparc64/stand/libsa/Makefile +++ b/sys/arch/sparc64/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/11/16 19:33:52 miod Exp $ +# $OpenBSD: Makefile,v 1.12 2016/11/06 16:04:20 tb Exp $ LIB= sa @@ -37,7 +37,8 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc NOPROFILE= NOPIC= -.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) +.if !make(clean) && !make(cleandir) && !make(includes) && !make(libdep) && \ + !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: @([ -h machine ] || ln -s ${.CURDIR}/../../include machine) .endif diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile index 073a0d1b71e..88beb85fd19 100644 --- a/sys/arch/sparc64/stand/ofwboot/Makefile +++ b/sys/arch/sparc64/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2016/09/18 16:34:59 jsing Exp $ +# $OpenBSD: Makefile,v 1.25 2016/11/06 16:04:21 tb Exp $ # $NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $ CURDIR= ${.CURDIR} @@ -67,7 +67,8 @@ CPPFLAGS+= -DSPARC_BOOT_UFS CPPFLAGS+= -DSOFTRAID .endif -.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) +.if !make(clean) && !make(cleandir) && !make(includes) && !make(libdep) && \ + !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: @([ -h machine ] || ln -s ${.CURDIR}/../../include machine) .endif |