From nobody Tue Aug 1 21:02:08 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 4RFnc72S0dz4pqqZ; Tue, 1 Aug 2023 21:02:08 +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 4RFnc05KMTz3LBV; Tue, 1 Aug 2023 21:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923728; 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=OVkHiB0A9zVCHEk9A31XwkHf6Du49htytvuRyIoTgwc=; b=D+byyO126ozHvC8OtnexgbFg7Vt3mGfN4OR1hk0KwCYQqUzmY30d9YJDnxs4fMyj1XHbpF fYBC97Qd4CIo13vlGDR71X/0n8/ljmhM1LuZbVYG4lUQ/XvMRPMBFSV5HGAXuZ9whU3mfP xmupPBGYzs94mBtqNdjwS1059wrKLxtJ53xiT0OyFkcoN9Jsfk3MM2gDBvIAobobSGh2mT 7R/sv9+fQuxQuzNRt0Tl+7T5onOIiqcF0gAkOm41JISwxHI7gVCTb44ZCKCTfpzY6uJKYw LnfbddnUVOgZpU5bJoztXqvPV24sIiM+sh75G+PT1+RE6IaVQBqhAZz4p/zj9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690923728; a=rsa-sha256; cv=none; b=sMDv2QhQ+yWDLZwt6cAjJW7/E+wAmFJ4uPp7KV39/urKSSr5w+FRgKbnAaZStoK16JXmEY h8S7HYhVQY7LYQsT0B8/Uycd3LpDTaUHKxystpjyU6VqmSQBSM6ELur2aU22PGmJBi9vz0 /W9Bd+yGlJ2csUHvwwGg8N/SkzR9N4hSUdnyg4Hv0bBbFFPP6JN3ga9LisqvIGsQ/BKF7T wg1yNt44U3h9ween5TCc5IP7lAzcOt1IN0UrG4XhFihn2zKiJJD0yFw2XDr8Wkr2wFHrnz 3DVl3X2ldMZr72l2qnDPJRQO8URN0CU/lH9hVtUJe1SvfAp/B8kBKEe+oDAOFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690923728; 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=OVkHiB0A9zVCHEk9A31XwkHf6Du49htytvuRyIoTgwc=; b=C9T/Ed8yWAdlvpZVS/VeCex2p61gd4uP9HI5Uz40PRrCa7ZPiZekSt3r17sUna8zSlUO7P zXllyJByd51L47loEXF4qU7nR3nCTuxXIQtkBlfa2ChMpjlcjhgBY09yZQEzvMTpIqRwEh abJBzPjO75BLqYntCyxQe67pABVOWaPikCeSwXr/JoIngfud1R/rr9TnHwsDNYjg0Ph360 iC4HZYBAJNBSHtrKv2DaPmtPwif3W0EvLrtzZKWzRKuHQxBPzELRHUiPKhEWKLnMQGeS9D DMzabJOa0rbtwfAKpiFXWP0AtfGGJqLWVREvLhucyeUCPPYFTSxF5uSYiR6KdA== 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 4RFnc03tH4zsjd; Tue, 1 Aug 2023 21:02:08 +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 371L28Y4012828; Tue, 1 Aug 2023 21:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L28MT012827; Tue, 1 Aug 2023 21:02:08 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:02:08 GMT Message-Id: <202308012102.371L28MT012827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1c02497648bd - main - Makefile.inc1: Enable requesting the universe toolchain. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c02497648bdf61a43dd271f6f9171a037046d8e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1c02497648bdf61a43dd271f6f9171a037046d8e commit 1c02497648bdf61a43dd271f6f9171a037046d8e Author: John Baldwin AuthorDate: 2023-08-01 21:01:57 +0000 Commit: John Baldwin CommitDate: 2023-08-01 21:01:57 +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 --- Makefile.inc1 | 8 ++++++++ Makefile.libcompat | 1 + 2 files changed, 9 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2e965b603d78..c102348baa6f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -73,6 +73,12 @@ TIME_ENV ?= time env .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} @@ -718,6 +724,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,^_,,} \ @@ -789,6 +796,7 @@ KTMAKE= ${TIME_ENV} \ 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 f9fe28e1082b..da9c326756aa 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -37,6 +37,7 @@ LIB${_LIBCOMPAT}WMAKE+= ${TIME_ENV} ${LIB${_LIBCOMPAT}WMAKEENV} ${MAKE} \ ${LIB${_LIBCOMPAT}WMAKEFLAGS} \ OBJTOP=${LIB${_LIBCOMPAT}_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ MAKEOBJDIRPREFIX= \ MK_INCLUDES=no \ MK_MAN=no MK_HTML=no