svn commit: r294744 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Jan 25 18:43:21 2016
New Revision: 294744
URL: https://svnweb.freebsd.org/changeset/base/294744

Log:
  Import latest host-target.mk 1.11 from contrib/bmake/mk

Modified:
  head/share/mk/host-target.mk

Modified: head/share/mk/host-target.mk
==
--- head/share/mk/host-target.mkMon Jan 25 18:40:25 2016
(r294743)
+++ head/share/mk/host-target.mkMon Jan 25 18:43:21 2016
(r294744)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 # RCSid:
-#  $Id: host-target.mk,v 1.7 2014/05/16 17:54:52 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)
@@ -11,24 +11,33 @@ _HOST_OSNAME != uname -s
 _HOST_OSREL  !=uname -r
 .export _HOST_OSREL
 .endif
+.if !defined(_HOST_MACHINE)
+_HOST_MACHINE != uname -m
+.export _HOST_MACHINE
+.endif
 .if !defined(_HOST_ARCH)
-_HOST_ARCH   !=uname -p 2>/dev/null || uname -m
+# for NetBSD prefer $MACHINE (amd64 rather than x86_64)
+.if ${_HOST_OSNAME:NNetBSD} == ""
+_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
-_HOST_ARCH != uname -m
+.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == ""
+_HOST_ARCH := ${_HOST_MACHINE}
+.endif
 .endif
 .export _HOST_ARCH
 .endif
 .if !defined(HOST_MACHINE)
-HOST_MACHINE != uname -m
+HOST_MACHINE := ${_HOST_MACHINE}
 .export 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
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r294744 - head/share/mk

[Bryan Drewery]

On 1/25/16 12:57 PM, NGie Cooper wrote:
> On Mon, Jan 25, 2016 at 10:43 AM, Bryan Drewery  wrote:
>> Author: bdrewery
>> Date: Mon Jan 25 18:43:21 2016
>> New Revision: 294744
>> URL: https://svnweb.freebsd.org/changeset/base/294744
>>
>> Log:
>>   Import latest host-target.mk 1.11 from contrib/bmake/mk
> 
> Could this please be de-duped by using `.PATH: ${.CURDIR}
> ${SRCTOP}/contrib/bmake/mk` to find the copy in contrib/bmake/mk ?
> Thanks!
> -NGie
> 

Ours does not match that version in all cases.

-- 
Regards,
Bryan Drewery
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r294744 - head/share/mk

[NGie Cooper]

On Mon, Jan 25, 2016 at 10:43 AM, Bryan Drewery  wrote:
> Author: bdrewery
> Date: Mon Jan 25 18:43:21 2016
> New Revision: 294744
> URL: https://svnweb.freebsd.org/changeset/base/294744
>
> Log:
>   Import latest host-target.mk 1.11 from contrib/bmake/mk

Could this please be de-duped by using `.PATH: ${.CURDIR}
${SRCTOP}/contrib/bmake/mk` to find the copy in contrib/bmake/mk ?
Thanks!
-NGie
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"