summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2016-11-06 16:04:22 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2016-11-06 16:04:22 +0000
commit5c44f8f4952e18adebbaf07d838da487fcb65f6c (patch)
treeaf8a04b81ff1b2e3e0a02bebb262f24ed1021583 /sys/arch/amd64
parent524d73769fc251cd985c3a354be4c47f1ec0c692 (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/amd64')
-rw-r--r--sys/arch/amd64/stand/Makefile.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc
index 9ed0d8b10d2..48004c4b4b5 100644
--- a/sys/arch/amd64/stand/Makefile.inc
+++ b/sys/arch/amd64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2016/07/04 18:01:44 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2016/11/06 16:04:20 tb Exp $
CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
CFLAGS+= -fno-stack-protector -DMDRANDOM
@@ -23,7 +23,8 @@ CLEANFILES+= assym.h machine
SACFLAGS+=-nostdinc -fno-builtin -fpack-struct
-.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:
@([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/amd64/include machine)