diff --git a/kbuildx/scripts/netbsd-build.sh b/kbuildx/scripts/netbsd-build.sh index 161a4c9..8e78272 100755 --- a/kbuildx/scripts/netbsd-build.sh +++ b/kbuildx/scripts/netbsd-build.sh @@ -2,11 +2,7 @@ set -eu version=$1; repo=$2; ref=$3; label=$4; requested_config=$5; bundle=$6 -export PATH=/usr/pkg/bin:/sbin:/usr/sbin:/bin:/usr/bin -# The release userland's /usr/bin/cc may not match the rolling source tree; -# use the pkgsrc GCC toolchain explicitly for host-tool bootstrap. -export CC=gcc -export HOST_CC=gcc +export PATH=/usr/pkg/gcc15/bin:/usr/pkg/bin:/sbin:/usr/sbin:/bin:/usr/bin work=/root/kbuildx src=$work/netbsd-src obj=$work/netbsd-obj diff --git a/kbuildx/scripts/netbsd-deps.sh b/kbuildx/scripts/netbsd-deps.sh index 391ec59..036223a 100755 --- a/kbuildx/scripts/netbsd-deps.sh +++ b/kbuildx/scripts/netbsd-deps.sh @@ -79,7 +79,7 @@ mkdir -p /usr/pkg/lib/perl5/5.42.0/TAP/Formatter /usr/pkg/bin /usr/pkg/sbin /usr export ASSUME_ALWAYS_YES=yes pkgin update -pkgin -y install git gcc git-base gmake binutils gmake bison flex perl mozilla-rootcerts-openssl \ +pkgin -y install git gcc15 git-base gmake binutils gmake bison flex perl mozilla-rootcerts-openssl \ || cat /var/db/pkgin/pkg_install-err.log if command -v mozilla-rootcerts >/dev/null 2>&1; then mozilla-rootcerts install