From nobody Sat Nov 30 17:11:47 2024 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 4Y0xRS1Tk7z5fL8D; Sat, 30 Nov 2024 17:11:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0xRS0RMjz41sw; Sat, 30 Nov 2024 17:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732986708; 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=aV3U5h1IvzFuBaPJ9ozZBKoqqsbpfLl1qAZJ8F3vXyE=; b=rkxQQzcaSrZiWDc3e90hVy7hVAv9M5/1aM+sDOrDj784Z9iB5gqJXs987NnzyppOCcNPQH RCA/lVimI3uBGiZE69RPSY8uME3yKiSmuQAioKKANxlCsvUVlvJyNru5utMfQXOM8GQZTu kfS96rzSglcywXknZYHtq8DCmW5qqHiFXFKNHgnfn5TEXmBdrv2DhLIY0abusCQh8QPxJ2 qOtIhIrNLl7prKPwHeyb3zQd1nF/w0jt4K4Z6W4TyMQUWQFWRstCuXKBruiLJekVskiHX1 oj7D62TJqbOKOLN5cjnHwrT8/LgM7RWoLtcdIEpmTUEKsa/9d+v7VYWbqMxZtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732986708; 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=aV3U5h1IvzFuBaPJ9ozZBKoqqsbpfLl1qAZJ8F3vXyE=; b=kExmjyEu8Ajtp5xwUEOk6YGkx9ir/E9fSVTO3W628mcsGQu5hiIYBsIVR/1YvuKRpW1+GS JaULUh7BrMqKvGqJBSiaMRjKV+B4n/2cJtUHPZwcg9NS7/C6+aZ8NGN6GCuJGTVoR68BwS 1kNOyb507qu/Vhu5fhYiQFSBOh+6vSGtHEjDHPZ9Ls2OGH/XZ9cIl94TNDvNV2aplxpuaE xcsS0XZAWIdCRM+owg6ILlTXQvdWj/6ImasItTfwgTtKRIuaBtfHhMVsTWTkX3geSi3cZp p6ceplNyUg/DyYXBtNP4FfCn3nDWHSym4wUjyYsJMsuiSG48eZGiOK82jtwOrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732986708; a=rsa-sha256; cv=none; b=S9wR2dvvaZSwXX2MN9oYlqjE02UwjlFskkzIhtHU/snALYMFddCLdS9D/+XiFNN9okXDBR /Zll8buyOyBsnBc4gZygdFCEegpnjKlyeWfpVFHLwlgYBcwhv2jtqvEX9nRreB6v4JMQVd LQiadJfXTwvzNxICT5IhjuwtQtd0Uiu8b4KanGZ3rYH/Cj5CJDgxp6/4/zghrxGYgA1EfY 71+8TTjCgD/0uX8vExSaxzoYxFEoz1smX11I2YdQXDNsLrA7Jgn5glv2DdDcXYyyo5p4un fmWtLk8kP/2oYQ9euCJNdhsJI7qeEj4fIT7uqHDnjgYY2zuAwqSUnv4MCZqDzg== 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 4Y0xRS03R0zHHH; Sat, 30 Nov 2024 17:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUHBlio089508; Sat, 30 Nov 2024 17:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUHBlaQ089505; Sat, 30 Nov 2024 17:11:47 GMT (envelope-from git) Date: Sat, 30 Nov 2024 17:11:47 GMT Message-Id: <202411301711.4AUHBlaQ089505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b5c4e8520ab3 - stable/13 - Makefile.inc1: Enable requesting the universe toolchain. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5c4e8520ab30b2348ed1d4bef15e879ecc0af9d Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c4e8520ab30b2348ed1d4bef15e879ecc0af9d commit b5c4e8520ab30b2348ed1d4bef15e879ecc0af9d Author: John Baldwin AuthorDate: 2023-08-01 21:01:57 +0000 Commit: John Baldwin CommitDate: 2024-11-30 16:51:59 +0000 Makefile.inc1: Enable requesting the universe toolchain. make universe builds a cross toolchain under HOST_OBJTMP/tmp via the universe-toolchain target. However, doing a plain 'make buildworld' after a universe/tinderbox run (e.g. to reproduce a failure and test the fix for it), will try to build a new cross toolchain under OBJTMP/tmp which can be tedious. This commit adds a make variable (UNIVERSE_TOOLCHAIN) which can be used similar to CROSS_TOOLCHAIN to request an external toolchain. If this variable is set (value doesn't matter), the the universe toolchain is used as an external toolchain. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40777 (cherry picked from commit 1c02497648bdf61a43dd271f6f9171a037046d8e) --- Makefile.inc1 | 8 ++++++++ Makefile.libcompat | 1 + 2 files changed, 9 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9190c449878c..fc5e82d39eca 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -73,6 +73,12 @@ LOCALBASE?= /usr/local .error CROSS_TOOLCHAIN ${CROSS_TOOLCHAIN} not found .endif CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" +.elif defined(UNIVERSE_TOOLCHAIN) +UNIVERSE_TOOLCHAIN_PATH?=${HOST_OBJTOP}/tmp/usr/bin +XCC?="${UNIVERSE_TOOLCHAIN_PATH}/cc" +XCXX?="${UNIVERSE_TOOLCHAIN_PATH}/c++" +XCPP?="${UNIVERSE_TOOLCHAIN_PATH}/cpp" +XLD?="${UNIVERSE_TOOLCHAIN_PATH}/ld" .endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -724,6 +730,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ BSARGS= DESTDIR= \ OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ @@ -792,6 +799,7 @@ KTMAKE= \ DESTDIR= \ OBJTOP='${WORLDTMP}/obj-kernel-tools' \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ -DNO_CPU_CFLAGS \ diff --git a/Makefile.libcompat b/Makefile.libcompat index 8c9d7273e5c8..58d4dbbfbee3 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -30,6 +30,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ OBJTOP=${LIBCOMPAT_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \