diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-12-08 01:29:07 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-12-08 01:29:07 +0000 |
| commit | ac3446e9622734082045b834a8f6327820d0dac1 (patch) | |
| tree | 318e0c200a044475b5d659b07c75b7cdd77b14e1 /contrib/bmake/mk/host-target.mk | |
| parent | 8adf31cadd18179b733443b4a9fd9b3420ff8646 (diff) | |
| parent | 7c6c27a0ba74c140cb8bf378239a6d660e8bce0f (diff) | |
Merge bmake-20151201
Notes
Notes:
svn path=/head/; revision=291978
Diffstat (limited to 'contrib/bmake/mk/host-target.mk')
| -rw-r--r-- | contrib/bmake/mk/host-target.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bmake/mk/host-target.mk b/contrib/bmake/mk/host-target.mk index b67c34d2523c..f528db9c6d24 100644 --- a/contrib/bmake/mk/host-target.mk +++ b/contrib/bmake/mk/host-target.mk @@ -1,5 +1,5 @@ # RCSid: -# $Id: host-target.mk,v 1.9 2015/09/10 18:42:57 sjg Exp $ +# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $ # Host platform information; may be overridden .if !defined(_HOST_OSNAME) @@ -21,7 +21,7 @@ _HOST_ARCH := ${_HOST_MACHINE} .else _HOST_ARCH != uname -p 2> /dev/null || uname -m # uname -p may produce garbage on linux -.if ${_HOST_ARCH:[\#]} > 1 +.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == "" _HOST_ARCH := ${_HOST_MACHINE} .endif .endif @@ -33,10 +33,10 @@ HOST_MACHINE := ${_HOST_MACHINE} .endif HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//} -HOST_OSTYPE := ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} +HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH} HOST_OS := ${_HOST_OSNAME} host_os := ${_HOST_OSNAME:tl} -HOST_TARGET := ${host_os}${HOST_OSMAJOR}-${_HOST_ARCH} +HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH} # tr is insanely non-portable, accommodate the lowest common denominator TR ?= tr |