From owner-svn-src-head@freebsd.org Tue Nov 6 15:31:51 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C597A11278DF for ; Tue, 6 Nov 2018 15:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it1-x132.google.com (mail-it1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 331447C13C for ; Tue, 6 Nov 2018 15:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it1-x132.google.com with SMTP id h13so18395307itl.1 for ; Tue, 06 Nov 2018 07:31:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WnMAcSs2WliyzC16J117mbmLuLmjlOWKjUcDugXxjG4=; b=iohL8uz3tlgazb2+1IJa6XMLMXgPq4GpJIN/6qjo0vAd23v00y8OBG1hsAJUcWRJ2W iVjWzEs/cvtgL+rnLh/Re9+OVyaul8r5YLh7TApsMLYOwOspJQ3lmEbJvkLP7CYYk4yi rhVB+ixpEdhIrhjnet/sIxgzgFvyigkOwfJR4TiFGR9ikx8VagD1hQ/0vLw8RQD+wPrs Fbq8Un65YpHJhgnPaybAlWj+vU2hhN/fnZAqk944fqzd8LI9maqq/TxsX271+xcYoS35 6NlV50fJzk2BT5ZZS4GOmDILhjkKscRh9PxsxxPxVtm3x0/ZSdBP+y5+8hi3qkQ9FuqE butw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WnMAcSs2WliyzC16J117mbmLuLmjlOWKjUcDugXxjG4=; b=cMBTb+3v++Dizbw0imlUx/k68J7w3VOBnNh+1Q7aLbOCrX0q1lV324fYG/aYbNL2SM +9H0ilVTecjL6tozIMZAnfppOPNJZJtCkkB903tZHLVjyFziEitr4hlPIoMtlYWaBMgK xQV296y7zyqYkmh5Uk0M4wUKk2NTBY/dPfH/aVoQusujdMxT598FnkAE4xL9Z9Eq7owI A6522SY4M0nIq7npHrFV4/OiEct6eDiFkCyMHQGxc27OM+czgXJjurAConX/fOKhOabA KNwrJNnavkYzOervk+WG6B4vq2uDBO7U7yqkQXsggTtTSuN4i/e7Hgw01g6zL1qSef2V 9sRw== X-Gm-Message-State: AGRZ1gLvQutDqg7Qw7PFr+ltUY+BEMB0O+kIrrPp7phZePFOu19kokE7 O9dOWh4iD3/CCnnoL2mDpKW77DR7VUbqxm9eIAVoxw== X-Google-Smtp-Source: AJdET5d0O0/5DH6bVMDKsyIBpn3sGwzqCpiVdGLxBteuawTMaKh2/7qxsMEwO7usuJ/oT2S/u8yCZ7vWxhU6yBbW6gs= X-Received: by 2002:a02:31d:: with SMTP id y29-v6mr25148239jad.98.1541518310098; Tue, 06 Nov 2018 07:31:50 -0800 (PST) MIME-Version: 1.0 References: <201811060936.wA69axn1021853@repo.freebsd.org> In-Reply-To: <201811060936.wA69axn1021853@repo.freebsd.org> From: Warner Losh Date: Tue, 6 Nov 2018 08:31:38 -0700 Message-ID: Subject: Re: svn commit: r340176 - head To: Alex Richardson Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 331447C13C X-Spamd-Result: default: False [-3.30 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.981,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.989,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[2.3.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.81)[-0.806,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.52)[ipnet: 2607:f8b0::/32(-1.15), asn: 15169(-1.36), country: US(-0.08)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2018 15:31:52 -0000 On Tue, Nov 6, 2018 at 2:37 AM Alex Richardson wrote: > Author: arichardson > Date: Tue Nov 6 09:36:59 2018 > New Revision: 340176 > URL: https://svnweb.freebsd.org/changeset/base/340176 > > Log: > Remove btxld from symlinked host tools > > It is only present on amd64/i386 systems which breaks buildworld on > other hosts. In fact there is no need to add it to the bootstrap tools > list since it is already included in the cross-tools phase. > However, for cross-tools it was only built if the host and target > architecture didn't match. After this change it is also built when we > are builtin with a strict $PATH. > > Reported By: mmel > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > > ============================================================================== > --- head/Makefile.inc1 Tue Nov 6 07:41:32 2018 (r340175) > +++ head/Makefile.inc1 Tue Nov 6 09:36:59 2018 (r340176) > @@ -2204,7 +2204,6 @@ _basic_bootstrap_tools+=usr.bin/unifdef > .endif > > .if ${MK_BOOT} != "no" > -_basic_bootstrap_tools+=usr.sbin/btxld > _basic_bootstrap_tools+=bin/dd > # xz/unxz is used by EFI > _basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz > @@ -2375,7 +2374,7 @@ kernel-tools: .PHONY > # we get done with the earlier stages. It is the last set of tools needed > # to begin building the target binaries. > # > -.if ${TARGET_ARCH} != ${MACHINE_ARCH} > +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BUILD_WITH_STRICT_TMPPATH} != 0 > I've often wondered if we shouldn't just always build this when the target is x86, in which case this line can go away. There's no real savings here in terms of build time, and this special case has always rubbed me the wrong way. Warner > .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" > _btxld= usr.sbin/btxld > .endif > >