diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-07-11 22:45:05 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-07-11 22:45:05 +0000 |
| commit | 367d32e2b15fe0397ddecccaa04cf9ed0164c969 (patch) | |
| tree | 0a2abe7ed935e714ada921e5d94a9859c1298a31 /mk/host-target.mk | |
| parent | 1a2b743f6b4022dada4eeaa96ac47a5c1a2429f5 (diff) | |
Import bmake-20200710vendor/NetBSD/bmake/20200710
from ChangeLog:
o filemon/filemon_dev.c: use O_CLOEXEC rather than extra syscall
o meta.c: target flagged .META is out-of-date if meta file missing
o cond.c: fix for compare_expression when doEval=0
o unit-tests/Makefile: rework
o filemon/filemon_dev.c: ensure filemon fd is closed on exec.
Notes
svn path=/vendor/NetBSD/bmake/dist/; revision=363115
svn path=/vendor/NetBSD/bmake/20200710/; revision=363116; tag=vendor/NetBSD/bmake/20200710
Diffstat (limited to 'mk/host-target.mk')
| -rw-r--r-- | mk/host-target.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/host-target.mk b/mk/host-target.mk index f528db9c6d24..a83642c9698c 100644 --- a/mk/host-target.mk +++ b/mk/host-target.mk @@ -1,5 +1,5 @@ # RCSid: -# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $ +# $Id: host-target.mk,v 1.12 2020/07/08 23:35:29 sjg Exp $ # Host platform information; may be overridden .if !defined(_HOST_OSNAME) @@ -37,6 +37,11 @@ HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARC HOST_OS := ${_HOST_OSNAME} host_os := ${_HOST_OSNAME:tl} HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH} +# sometimes we want HOST_TARGET32 +MACHINE32.amd64 = i386 +MACHINE32.x86_64 = i386 +_HOST_ARCH32 := ${MACHINE32.${_HOST_ARCH}:U${_HOST_ARCH:S,64$,,}} +HOST_TARGET32 := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH32} # tr is insanely non-portable, accommodate the lowest common denominator TR ?= tr |