From owner-svn-src-head@freebsd.org Fri Nov 3 22:32:23 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9722E5CC87 for ; Fri, 3 Nov 2017 22:32:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8969F764E9 for ; Fri, 3 Nov 2017 22:32:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22c.google.com with SMTP id n137so9427373iod.6 for ; Fri, 03 Nov 2017 15:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=2Yq2Bs2+B7f0BiTtoU2Wn1jUuTX65r+5pZ6SYR9ZbSc=; b=IY4TRdtSEkasoH6EqvjHNDbQP6L2fyuYy8Q7JcN2sA2Ru2FBxJpS8JxOK0EWcGlaH2 grRiVx/ku/oI79yBgbqZDQ9xhjeiRirzkErtNTeP4GXCXuI0BtI2ClKCZwdtMhTteQUY mP9UJ/YUzbVEMTtXCDI9+rcwV+m2FUiZ7E3DwrzSIV0WEByEVl7/MS/jsqj1mLcst6HS 1+b6DNFPd2+XmawjM0dbwnM5ZeVyu7yyQlIl0QRgIKXbc/SYWDT5TsmJgRFBg+Eh04n8 7aYnbN6PvvLx+XuuI/4c13LmzBAQ6u/BNxPhYk3IYtIZ9grGHZ+hkTT6w3FrUXk2dheB N8Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=2Yq2Bs2+B7f0BiTtoU2Wn1jUuTX65r+5pZ6SYR9ZbSc=; b=JcxP05t7x21xF2bl/Kkoug2qiyJjn3s4V+TnO8PwG5isVpj2Tk00o9x2Rm1eR9KfLj ExiIMtCOAtqaopAFpsxIE5bTvYX0/EwREfdnZgN+N9v1KQUYrmfffl/cwmTron/cUmaA rygEDdfnZnN8bCkgyqtlOdO+Xq2DNSaTh282QfEeW/prEemYhOprssxhIrALve7oCIFd ANXTmS7x/XZJGQ73bGVQ4UeqEwTq3rKw4ylJvaiApt+n0BqMZ24kHq3hMZnPWI0TJBsH ojLIz7E7mfoRqUWzduavUYMhcuqsJyDTlFe8KrTwgWe4Ky+0xGRalbM6IynXUZ7xIbPk sOAA== X-Gm-Message-State: AJaThX4hCipd7cp07aUS+4s6iuKvzT5ShgjCaT5JEkGHSd30Kshc+50n 1wcMxnJpcqiohwDgzwaFY1F8QrI0AhOhpUm3jz6cm1WI X-Google-Smtp-Source: ABhQp+R6ZYx7ftG5hbefxuQ0r1FT+YcEoKfZx5bJnRsNayKP7GhWmrdkOP/QTeExgWfCvsTIwo9Q38c5MuMCNl91RLw= X-Received: by 10.36.64.145 with SMTP id n139mr647719ita.115.1509748342869; Fri, 03 Nov 2017 15:32:22 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Fri, 3 Nov 2017 15:32:22 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:4daf:1291:4f1b:d2ea] In-Reply-To: <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> From: Warner Losh Date: Fri, 3 Nov 2017 16:32:22 -0600 X-Google-Sender-Auth: vn4hy64haGmES-VfNqJT7i-IuZM Message-ID: Subject: Re: svn commit: r325116 - head To: Bryan Drewery Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 03 Nov 2017 22:32:23 -0000 On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery wrote: > On 10/29/2017 8:12 PM, Warner Losh wrote: > > Author: imp > > Date: Mon Oct 30 03:12:38 2017 > > New Revision: 325116 > > URL: https://svnweb.freebsd.org/changeset/base/325116 > > > > Log: > > Return proper status from buildenv. > > > > make buildenv BUILDENV_SHELL= more useful. Remove '|| > > true' from the command line so that errors are properly > > returned. There appears to be no reason for it, and it dates back to > > the original commit by ru@. > > > > Sponsored by: Netflix > > Now simply running 'make buildenv' and 'exit' throws a make error. > > Perhaps we need a BUILDENV_CMDS that does what you want and we otherwise > leave the ${BUILDENV_SHELL} || true handling. Are you sure? 4:29pm zooty:[242]> make buildenv Entering world for amd64:amd64 $ exit 4:29pm zooty:[243]> Perhaps you can give me an example that causes that? This was the very first thing I checked before committing the fix... Warner > > > > Modified: > > head/Makefile.inc1 > > > > Modified: head/Makefile.inc1 > > ============================================================ > ================== > > --- head/Makefile.inc1 Mon Oct 30 03:12:34 2017 (r325115) > > +++ head/Makefile.inc1 Mon Oct 30 03:12:38 2017 (r325116) > > @@ -991,8 +991,7 @@ buildenv: .PHONY > > .if ${BUILDENV_SHELL:M*zsh*} > > @echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE} > > .endif > > - @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 > ${BUILDENV_SHELL} \ > > - || true > > + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} > > > > TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} > > toolchain: ${TOOLCHAIN_TGTS} .PHONY > > > > > -- > Regards, > Bryan Drewery > >