From owner-svn-src-head@freebsd.org Thu Aug 13 16:34:21 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C8CE37E2DD; Thu, 13 Aug 2020 16:34:21 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BSBwr51xTz4Vf6; Thu, 13 Aug 2020 16:34:20 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ej1-f67.google.com with SMTP id t10so6855695ejs.8; Thu, 13 Aug 2020 09:34:20 -0700 (PDT) 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=bNvVVzbpahudbFnvWds05xIv8LI2EmF0LIaWX15twqI=; b=RQ5aTG1rP5WrbEGP+smgWLsbnz5ICoXLmYsiGOjzE25+63MjIaOC58V8UtHwL6ot+v U/kWGONyvJncqZBwDZ/Cyaiy7mG4348YNph1tspjn9laF2rwxNp1ZadLQ/Uxi0FyQAY/ tESJ5PvGLB0XO+YF5RXvXf74e3qQSC80nRg0sh0oF6L8jop7afHg9tpKJYMRSeqKNfe1 pGz3Van8VHo2mgSh/Ms1Lbs57BDRDUDjjFy/ZMWoF232kDeUckHt5sn5NmPJZu+ljI15 tj1k/FIkiYw+8nGyadV0v3M0wl741WHEvNE51omLFbkTxUE4UIDJXqXfKaGRav4glhjZ p23w== X-Gm-Message-State: AOAM533QkOLhLl+G9STh3lpSoi7drz/eg8h4EY56MgkKsCikXrOGYa5/ nbqLz2lonvBphiDHk48CxgGKpPKI7jwBEQ== X-Google-Smtp-Source: ABdhPJwd3t/OfZNulMVW0SBp7I1H+aEKlaLPTRvmOFhJwfq3I88EmtKO1M5UTVTul3HFwLAHyo5p+w== X-Received: by 2002:a17:906:3790:: with SMTP id n16mr5521440ejc.256.1597336459031; Thu, 13 Aug 2020 09:34:19 -0700 (PDT) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com. [209.85.128.43]) by smtp.gmail.com with ESMTPSA id g25sm4214530edp.22.2020.08.13.09.34.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Aug 2020 09:34:18 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id p14so5232761wmg.1; Thu, 13 Aug 2020 09:34:18 -0700 (PDT) X-Received: by 2002:a7b:cc8e:: with SMTP id p14mr5005271wma.111.1597336458490; Thu, 13 Aug 2020 09:34:18 -0700 (PDT) MIME-Version: 1.0 References: <202008131622.07DGMoMw043409@gndrsh.dnsmgr.net> <84875FF7-A833-4FA1-9BB0-B75D607C4183@freebsd.org> In-Reply-To: <84875FF7-A833-4FA1-9BB0-B75D607C4183@freebsd.org> From: Alexander Richardson Date: Thu, 13 Aug 2020 17:34:07 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r364190 - head/tools/build To: Jessica Clarke Cc: rgrimes@freebsd.org, src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BSBwr51xTz4Vf6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Thu, 13 Aug 2020 16:34:21 -0000 On Thu, 13 Aug 2020 at 17:28, Jessica Clarke wrote: > > On 13 Aug 2020, at 17:22, Rodney W. Grimes wrote: > > > >> Author: arichardson > >> Date: Thu Aug 13 14:14:46 2020 > >> New Revision: 364190 > >> URL: https://svnweb.freebsd.org/changeset/base/364190 > >> > >> Log: > >> Add pwd to the list of tools that are linked to $WORLDTMP/legacy > > > > Since "sh" is already in this list, and our "sh" has a builtin pwd > > that does the correct thing with pwd -P this should not be needed. > > > > Or are we contininue to use the host "sh" for far too long? > > > > For me from ancient days of hand bootstrapping BSD sources onto > > another system sh(1) and make(1) are the first 2 tools to get > > working. > > The issue is that r364174 used `env pwd -P` rather than just `pwd -P`. With > that fixed, this should be revertible; even if the bootstrap sh isn't being > used at this point, I don't know of any contemporary sh-compatible shell that > doesn't implement pwd as a builtin (but surely we are using the bootstrap sh by > this point otherwise BUILD_WITH_STRICT_TMPPATH would have complained about sh). > > Jess I'll change it to use pwd instead of env pwd shortly and also revert the change that added pwd to the linked tools since using the shell builtin with -P is fine. We are not bootstrapping sh yet, but instead copying it from /usr/bin since it is not (yet) possible to bootstrap the base system sh on macOS&Linux. Alex > > >> After r364166 and r364174, crunchgen needs a pwd binary in $PATH instead > >> of using a hardcoded absolute path. This commit is needed for > >> BUILD_WITH_STRICT_TMPPATH builds (currently not on by default). > >> > >> Modified: > >> head/tools/build/Makefile > >> > >> Modified: head/tools/build/Makefile > >> ============================================================================== > >> --- head/tools/build/Makefile Thu Aug 13 13:59:31 2020 (r364189) > >> +++ head/tools/build/Makefile Thu Aug 13 14:14:46 2020 (r364190) > >> @@ -113,8 +113,8 @@ SYSINCS+= ${SRCTOP}/sys/sys/font.h > >> # Linux/MacOS since we only use flags that are supported by all of them. > >> _host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date dd \ > >> dirname echo env false find fmt gzip gunzip head hostname id ln ls \ > >> - mkdir mv nice patch rm realpath sh sleep stat tee touch tr true uname \ > >> - uniq wc which > >> + mkdir mv nice patch pwd rm realpath sh sleep stat tee touch tr true \ > >> + uname uniq wc which > >> > >> # We also need a symlink to the absolute path to the make binary used for > >> # the toplevel makefile. This is not necessarily the same as `which make` > >> > > > > -- > > Rod Grimes rgrimes@freebsd.org