Date: Tue, 25 Jul 2023 21:24:21 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: dd3ad7c21e76 - main - tools/build: Tidy up whitespace and comments, and delete duplicate code Message-ID: <202307252124.36PLOL7E030466@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=dd3ad7c21e767bc39f841e7af886941165a10bfa commit dd3ad7c21e767bc39f841e7af886941165a10bfa Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2023-07-25 21:24:02 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307252124.36PLOL7E030466>