From nobody Sun Apr 23 06:17:25 2023 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 4Q3yjL02gDz46vg1; Sun, 23 Apr 2023 06:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3yjK45fvz3Htx; Sun, 23 Apr 2023 06:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682230645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf97I75oW6IrSTRxIXvcrbjPKM4yGZ8WC2AZGhFWZtY=; b=Dp9HNvRLCR0716SPXwIWfAWqXzddlSs6Lb33B+B+3yRX0MeEqrAvo2dcfMEYQ0MTnu9FwR fYK6vtCu515WFPBvTuygTCWolXKFWjbPnMHdDIJgyLajmLixi9dlazUHqKYS0DpTCe/TKA u2B4rPOcD62viNBpQvai07HJKX1KkCL+M3IYeCu8pxf873n0S2M+yPQLdA/TH8B4/6FFfd fywrvOEm/1aaAIOz5KGbHHwqToUvl1qaDrZj95/zXis6T2xBB9oNotkjfk2K5nicqrjFSQ bd0/ct/T6zGZdOafWFExVS4T+2fbr3a6cj/KitSDgljEEtZOLEfaYqIa2jGcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682230645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf97I75oW6IrSTRxIXvcrbjPKM4yGZ8WC2AZGhFWZtY=; b=C2nl7/jSHXGV5Bvwf38pDlxVEcYSWV4+3ZESSNW6vdesNS3e5YLzXrK2mcnmf5WnymsuW+ yBft5EdoTj1PJqDF/J1ZuG9M4XFKXHwkSWFWLQNB/r82VtrkUz9zPEw0PelNEYXbag1dx6 y6krVHa8ViVBxGijtkqzo+Yvl18Gb6G0C3IK8pOWP+inHD41OIkhX1Dye346bhTmqnnRkH a2I1h7+NsHpSlLLajyaWtmsLQ2qv4CIihyqXHvlNHOECxd+dIUZGlPrkOL/Un9/SvuejLa It3ZtShNgGukQrQuBJ+S4rQY+zl6Qy2MK0IATHGtewov12umsmhECHgq+7C3LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682230645; a=rsa-sha256; cv=none; b=ZwOkIRGueyH3/EV8Mu/AZudRqE11ZeeG8fZYoYqtlTW2OJhcM63Adq/SdvE6Z7ldnp/JCH JzN17C3s8+ae7yD4zN2rnbndz0VaXaoCDyDuSFKFGs4E0yms8qr/MjGodjS8zSgLbrYTFg nLVAadaPUCW0JWQPmf3mP+NBgB40QBofaIdPLmtNgh40GykmyuMNogXN644B/vu7emFL9W PE7wHJ5JSwdHic5qL5G/d9ZDZcOLdwEKcg7aTWWcyKXcFBn+hiYN0j0yzDaW1TeGsSDiNI 7kY9TJnlhmpFrO+4jRLcy0yA4DEUpLafiqfh582u2dbprD3f/Yb9wTbEhdanvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3yjK2qyvzXtk; Sun, 23 Apr 2023 06:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N6HP3i071421; Sun, 23 Apr 2023 06:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N6HPII071420; Sun, 23 Apr 2023 06:17:25 GMT (envelope-from git) Date: Sun, 23 Apr 2023 06:17:25 GMT Message-Id: <202304230617.33N6HPII071420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d7e3299f607f - main - Ensure good exit status from type 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e3299f607fc2c58ec1f701c57402d39273b832 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e3299f607fc2c58ec1f701c57402d39273b832 commit d7e3299f607fc2c58ec1f701c57402d39273b832 Author: Simon J. Gerraty AuthorDate: 2023-04-23 06:15:05 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-23 06:15:05 +0000 Ensure good exit status from type When looking to see if nproc is available we do not want warnings about 'type nproc' having bad exit. --- share/mk/local.sys.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 1aac5014b737..abcbf396c6b4 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -62,7 +62,7 @@ _PREMK_LIBDIR:= ${LIBDIR} .if make(*-jobs) && empty(JOB_MAX) # provide a reasonable? default for JOB_MAX based on ncpu JOB_MAX_FACTOR?= 1.33 -NPROC?= ${(type nproc) 2> /dev/null:L:sh:M/*:[1]} +NPROC?= ${(type nproc || true) 2> /dev/null:L:sh:M/*:[1]} NPROC:= ${NPROC} .if !empty(NPROC) ncpu!= ${NPROC}