From nobody Sun Jun 02 23:04:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VssrR000Tz5LRHY; Sun, 02 Jun 2024 23:04:54 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VssrP49nbz45WQ; Sun, 2 Jun 2024 23:04:53 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="Z/vEvspW"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::329 as permitted sender) smtp.mailfrom=markjdb@gmail.com Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-6f8e9d4dff3so2374450a34.0; Sun, 02 Jun 2024 16:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717369492; x=1717974292; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=g0Qe3UCsBvlFwOvPO7C5k/GNBl5Y1PK6kgAYChSCRfA=; b=Z/vEvspWQPUxp1rD2LPho6aBeoXonld5RneIdI7vM6Xm/XjtD59vLz3VCUXfOrKO/O R5X6gBz/J3FX6e14d0TZnsUKs50yfQ89SuSbasi2+LXFpaalDB3YFxTzCwNLiy1eti3S 6fFe8gDRSZQE8cigkViMJCCrPG3YQW0I0j5cXicwuZmy3yLytckvKiFS4w4XJnHcVmrt w0KXhmrRJW+/ZAZ8E7gc40C5l2P4fDqaU8NYO2et7hIZpVl0pEUsB/ouj/JtqwA/yCii ytCN/Bf9s9XCwcBbGDqQ0Rp7I9pv78k9YLHsNZ5cOVdJiD84OZv05LpekI08MifrKtKK hhuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717369492; x=1717974292; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g0Qe3UCsBvlFwOvPO7C5k/GNBl5Y1PK6kgAYChSCRfA=; b=g1v5s8iGlwMBLefTiR0O60vfhNEcy9Wmt7yomSfThcjWHwNO0mQHzdC1HlBqJVLEr2 PP5ZQAKm9fPeIcmsfFnwHlKQ79C1LSIVIt6rBoH4OThEY5GDGgK/3UPCvXYCWD7QRh41 CN63m+uGTv7MQ0MdTJPxDRfszi+XliqBT/i/MoOk/fFUYroM5XCGYulUux6T1asb+3Mi EegEWLWF10v8ftc55xPgZyD09KdOJYc8eTotWIhUowDX+tBlw+s8QSOd+kfNRnVHVYNR 2sbMuq1GBSmjoApRUCF5y3rybWJgHYwI1GxWslUm8R9ZE7jOKUH5VLwYdFpYkHKE2IST CcwA== X-Forwarded-Encrypted: i=1; AJvYcCVB0qPtbh2qzlGWaSOLs4LhnAD8vFtcWXb4HpFC++aLV+ZrybbXVMvlpe61YdggVB6m33Ng+KjWa+pjCWhFEVmamocSL7OTtdm3U1FfgAjXiGTwcH0EpFEW/hLdO9seZV5mvtPe6Ef8NHstR+fjnfM2eQ== X-Gm-Message-State: AOJu0Yy4Hal4O9nF3qZlnYfK2hFBwYoDUUw0JBNlYakYQMCEvDvDUZM2 Wfp+WpHUdto5U5kKT7mSeIEeO3aGE9I9gxBlzfqhwcPnSIhQYWmWXtJ/ZA== X-Google-Smtp-Source: AGHT+IHRooS/GCmQF9/H5x6wknszOMwA+XLkoAAveAUmEeZR9U4lpcQp4tkDOee1UvGre/csrN3Trg== X-Received: by 2002:a05:6830:1d4:b0:6f9:726:3b8f with SMTP id 46e09a7af769-6f911f317c2mr8386043a34.11.1717369491402; Sun, 02 Jun 2024 16:04:51 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff23e269bsm33620891cf.46.2024.06.02.16.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 16:04:50 -0700 (PDT) Date: Sun, 2 Jun 2024 19:04:40 -0400 From: Mark Johnston To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2b7c1402f96b - main - src.sys.obj.mk: Export OBJTOP Message-ID: References: <202405281852.44SIqo71094994@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202405281852.44SIqo71094994@gitrepo.freebsd.org> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.986]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::329:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4VssrP49nbz45WQ On Tue, May 28, 2024 at 06:52:50PM +0000, Simon J. Gerraty wrote: > The branch main has been updated by sjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2b7c1402f96be2d2986738e32706dab7b5691ef0 > > commit 2b7c1402f96be2d2986738e32706dab7b5691ef0 > Author: Simon J. Gerraty > AuthorDate: 2024-05-28 18:51:31 +0000 > Commit: Simon J. Gerraty > CommitDate: 2024-05-28 18:51:31 +0000 > > src.sys.obj.mk: Export OBJTOP > > If we had to set OBJTOP we want to .export it (if .MAKE.LEVEL > 0) > for the benefit of things like x!= ${.MAKE} -r ... and similar. > > Without OBJTOP, the default MAKEOBJDIR setting will result in > attempting to use an objdir like /lib or /bin etc in some cases. > > This patch is based on D30990 > with the addition of the check for level > 0. > > Reviewed by: jrtc27 > Differential Revision: Hi Simon, This breaks "make -j kernels" for me. The parallel kernel builds appear to share an object directory and step all over each other. This happens with and without the level > 0 check. > --- > share/mk/src.sys.obj.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk > index 708559edcdb8..e4c31f746f3d 100644 > --- a/share/mk/src.sys.obj.mk > +++ b/share/mk/src.sys.obj.mk > @@ -94,6 +94,9 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} > # TARGET.TARGET_ARCH handled in OBJROOT already. > OBJTOP:= ${OBJROOT:H} > .endif # ${MK_UNIFIED_OBJDIR} == "yes" > +.if ${.MAKE.LEVEL} > 0 > +.export OBJTOP > +.endif > .endif # empty(OBJTOP) > > # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX. >