From 6b6aa29fa16e68b90dd62722d6d5c43b3f3fe38c Mon Sep 17 00:00:00 2001 From: nia Date: Wed, 26 Mar 2025 10:58:29 +0100 Subject: [PATCH 1/2] bootstrap: Use system nawk on solaris 10 --- bootstrap/bootstrap | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 904fa2e356cb..c86800eb501d 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -776,9 +776,7 @@ SunOS) need_bsd_install=yes use_bsdinstall=yes - # Use native nawk and sed if available on newer illumos. - /usr/bin/nawk --version 2>/dev/null | grep "awk version " >/dev/null - if [ $? -eq 0 ]; then + if [ -x "/usr/bin/nawk" ]; then bootstrap_awk="/usr/bin/nawk" elif [ ! -x "/usr/gnu/bin/awk" ]; then need_awk=yes From 95e1c08a3562c6d63cf8c0a7058eff2df71f6ad4 Mon Sep 17 00:00:00 2001 From: nia Date: Wed, 26 Mar 2025 10:59:50 +0100 Subject: [PATCH 2/2] mk: teach about wget on SunOS --- mk/tools/tools.SunOS.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk index e6c31a423889..0012639e7eda 100644 --- a/mk/tools/tools.SunOS.mk +++ b/mk/tools/tools.SunOS.mk @@ -212,6 +212,9 @@ TOOLS_PLATFORM.uniq?= /usr/bin/uniq TOOLS_PLATFORM.unzip?= /usr/bin/unzip .endif TOOLS_PLATFORM.wc?= /usr/bin/wc +.if exists(/usr/sfw/bin/wget) +TOOLS_PLATFORM.wget?= /usr/sfw/bin/wget +.endif TOOLS_PLATFORM.xargs?= /usr/bin/xargs .if exists(/usr/bin/xz) TOOLS_PLATFORM.xz?= /usr/bin/xz