From nobody Tue Jul 25 21:24:21 2023 X-Original-To: dev-commits-src-main@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 4R9VQs2WKZz4p5PQ; Tue, 25 Jul 2023 21:24:21 +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 4R9VQs1r3cz42sT; Tue, 25 Jul 2023 21:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690320261; 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=oPs2SOtkfO5KSp4nyI3KzLAa8HPrPcId57aVai5K8dw=; b=GPgYkIWx4YoH6Olq71iD27CQy6AANcjurrnHMkfZA/kjClCnK5M+s7poa+ce55Z3R11J5k xmcCAaaAapdYP/Os+3kTQ6+ciRWvsYATRWRQOPE4Gwhuh8lsCCmeCJ1sY1j7Vz+BZhUPcD qipAHqxDEzIJ2wxj9oWr1qhRf4/twZEsrufZmI+WjS6jT9QXwIz4Dz4tzlJ7C/8uepgvb7 daK8MPyTAT74K2fNw7Eok5MeUsLl6uGIntfEyy2eB8FhbkzoizJP/uum7w54onYAnRJVgk iLtD7bHoI5Ut3nPJ3j6RVpUHPjHhhWPHeCZvdY+x+h83VnmuWy6rFeQvYCP/Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690320261; 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=oPs2SOtkfO5KSp4nyI3KzLAa8HPrPcId57aVai5K8dw=; b=Xds4bWU1J1IyFGbtdrhf9UUScC2Jpud/zcb9bxonYYWUWdLxzr1LRJZrrFr/AzT4fCoyPo 7PcXf4LoYQXn4w32GAqqoesdyW6jmm9MtoS5I0UmQDJwtqUkNqCl5wW4X6kQmoHVcqvoQv FDyXlUoOlzJ2THmI1gcAY85ZSVZ6sobpmbAe1yy8mjXc2KN0se2nCW/2BAGttDyYFfL6bc OwS36ylGA3jylsVV9tZFifbXAGYR0KIoPot3X9yzIHzls3RN0pVvuOwyRQdfkVTV6/+xeO +/jwWDe/YASGCPGXvzWy+Oaf7QIqpk6hg6f9R5Du12Wb5q+EFedyyt0XMCKWEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690320261; a=rsa-sha256; cv=none; b=lyM/kK5VZLeh8bi/Y8Gh1O403Gvxn+baNKyx6eujKxH4e6WaQzfUVojtPBEI3gf4FoxHQY CmOVtxyXSlNBbOtI0Ebg4AY3EtAe8c6Vaa593kNK0eF52FiDJFwmrruSp5+733EUReHLnC 4/OA+8rDhlWcfclpB5AHk+MrvmYT4zmqWeoMH7XBvsoopv3P5fVH897BngnLDrQ5Qsv7pP /g5mxITkEprKYxSrC9lIz9AWcSwVN287oH2zpr4LELFsHHq95coh3spG8PRqNn/MtI69Ri 7+6E1wcmN+05Mpbw9OvPoMPESG35wity1f1wuqi8PgY1eeBgJsRr8mWoMBq1oQ== 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 4R9VQs0p6wzGxs; Tue, 25 Jul 2023 21:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36PLOLTq030467; Tue, 25 Jul 2023 21:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PLOL7E030466; Tue, 25 Jul 2023 21:24:21 GMT (envelope-from git) Date: Tue, 25 Jul 2023 21:24:21 GMT Message-Id: <202307252124.36PLOL7E030466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: dd3ad7c21e76 - main - tools/build: Tidy up whitespace and comments, and delete duplicate code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd3ad7c21e767bc39f841e7af886941165a10bfa Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=dd3ad7c21e767bc39f841e7af886941165a10bfa commit dd3ad7c21e767bc39f841e7af886941165a10bfa Author: Jessica Clarke AuthorDate: 2023-07-25 21:24:02 +0000 Commit: Jessica Clarke CommitDate: 2023-07-25 21:24:02 +0000 tools/build: Tidy up whitespace and comments, and delete duplicate code We already handle the make and bmake links unconditionally above. --- tools/build/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index eb5bd44db6a1..7d6ed8befb30 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -316,23 +316,23 @@ _host_abs_tools_to_symlink= ${_make_abs}:make ${_make_abs}:bmake # When building on FreeBSD we always copy the host tools instead of linking # into WORLDTMP to avoid issues with incompatible libraries (see r364030). # Note: we could create links if we don't intend to update the current machine. -_COPY_HOST_TOOL=cp -pf +_COPY_HOST_TOOL= cp -pf .else # However, this is not necessary on Linux/macOS. Additionally, copying the host # tools to another directory with cp -p results in freezes on macOS Big Sur for # some unknown reason. It can also break building inside docker containers if # there are ACLs on shared volumes. -_COPY_HOST_TOOL=ln -sfn -_make_abs!= which "${MAKE}" -_host_abs_tools_to_symlink+= ${_make_abs}:make ${_make_abs}:bmake +_COPY_HOST_TOOL= ln -sfn + .if ${.MAKE.OS} == "Darwin" # /usr/bin/cpp may invoke xcrun: -_host_tools_to_symlink+=xcrun +_host_tools_to_symlink+= xcrun .endif # ${.MAKE.OS} == "Darwin" -# On Ubuntu /bin/sh is dash which is totally useless. Let's just link bash -# as the build sh since that will work fine. + +# On Ubuntu /bin/sh is dash which is totally useless, and the same for modern +# macOS. Let's just link bash as the build sh since that will work fine. _host_abs_tools_to_symlink+= /bin/bash:sh -_host_tools_to_symlink:=${_host_tools_to_symlink:Nsh} +_host_tools_to_symlink:= ${_host_tools_to_symlink:Nsh} .endif host-symlinks: