From nobody Thu May 19 15:12:53 2022 X-Original-To: dev-commits-src-branches@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 216131B37E90; Thu, 19 May 2022 15:12:54 +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 4L3tdd6yrrz4k3h; Thu, 19 May 2022 15:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652973174; 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=5ybc5r0beSfrfaRbhpYrPrwHiQHyWop/iwfEfVsOgBI=; b=j8mhwHu/gAJ4TZfBNQGdrxq3SyIWoYupoLDoB6u6Uh7fdnDJu955Up6w3Dh16Pn3x5w+iP ZvqsxpR/t6LvFjx9nF5rbNgr/rdYBPxlAcdBjB/88bSspW1P3o6gqLw4rHmeBmdZWMto/l 3NN31Jvd2zZzMR24nBOxAOWRwpsiPR7Vfr1w0UC3By/sCWDvF/rCYJA3NRlvRSofCau+c9 EjwwXCDm0YB/oGU66pRkt2cuF0QiP3GnA9ruujIsZjBMvvP13WNtQUA+PY+oQcyfj4D+uX OgElSMeSEQTmxxlBt607oJRUlefXqblNR95RuamrOMpASniJH4pgKQrESQm//g== 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 CF7E9201DA; Thu, 19 May 2022 15:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24JFCrXV024570; Thu, 19 May 2022 15:12:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JFCrdN024569; Thu, 19 May 2022 15:12:53 GMT (envelope-from git) Date: Thu, 19 May 2022 15:12:53 GMT Message-Id: <202205191512.24JFCrdN024569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 702e1e5d1ef6 - stable/12 - native-xtools: avoid libllvm while populating the sysroot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 702e1e5d1ef6b019db926a4bc714bed013a2392e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652973174; 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=5ybc5r0beSfrfaRbhpYrPrwHiQHyWop/iwfEfVsOgBI=; b=EY8iPC0+aD3Gx8I4vvUSALUOwx+pK8BX0iwXXeMFGgGM12akKvrNyqH7JqePg84FRd+P/8 4qw9GKNv2BQh96nfKtpHF1yjMM2RuWF2rTMcKaYPEh+xeyGc82rqtFEbEwKYUCsog4brmP tIbAjeuOtLWAkOo91NIymBqyy/fZgRVvMMAdWv+NE4+LHEqRqVaUOujxF41nyODq5hrejI wvq6bGim54GvtSoEh/9s2P9Fystvm+tC/wepcjny60KkHtWCIf8T+HtI6fJ+JTHkkGqUVh E2jIubnTIOaxVsTcCswrt7t5KF1dmVBpRnOgFmwmi5qrcVCNxmFZv7Vz9sAGuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652973174; a=rsa-sha256; cv=none; b=MyAHPnGnZbCkajonmIljuLsVWwkmqI89P8W7pUmq3VXR0nERXYDzaRxOOja82VfKq2lFsC gVGl/mvF7h7sB/KAdXyFB7mG5cnGJQ16WEBQoyTkLO11b10eGHFhO/51dHz1+LAim/L850 ufwxAM5J20kFmNrnmh8DbdYrEysW5WKUMQwNLMGy56PgbmvfRZaaoaqp/JRxusytF0iIS3 1/xS4jZZ3PqaKujGvlASmDS6hZ7QkDiCCATqeF/Nbunr1OanyTFFU/h6JaTfPgKqDct/kt JUGFJ5dYYhbkhtXrwHuR+BcZoaykvBMoBpFn5AXbpVw+Ytv90+TGL5rqWcNI5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=702e1e5d1ef6b019db926a4bc714bed013a2392e commit 702e1e5d1ef6b019db926a4bc714bed013a2392e Author: Kyle Evans AuthorDate: 2021-10-13 09:21:28 +0000 Commit: Kyle Evans CommitDate: 2022-05-19 15:12:42 +0000 native-xtools: avoid libllvm while populating the sysroot Prior to 021385aba562, MK_CLANG=no was sufficient to avoid descending into lib/clang, but the referenced change added a couple of other enabling knobs. Turn those off, too, to continue avoiding libllvm. With this change, we no longer end up with a libllvm using the wrong default target triple; `poudriere jail -cx` works once again. Reported by: bhughes, imp, probably others Fixes: 021385aba562 ("Add WITH_LLVM_BINUTILS to install LLVM ...") (cherry picked from commit e2e2c622c35f3e54dbae88e3de3e48c51dbb4ebd) --- Makefile.inc1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a714302a5744..3bfe99f2e6c3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2544,6 +2544,10 @@ NXBMAKEARGS+= \ MK_WARNS=no \ MK_ZFS=no +# This should match all of the knobs in lib/Makefile that it takes to avoid +# descending into lib/clang! +NXBTNOTOOLS= MK_CLANG=no MK_LLD=no MK_LLDB=no MK_LLVM_BINUTILS=no MK_GCC=no + .if make(native-xtools*) && \ (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH)) .error Missing NXB_TARGET / NXB_TARGET_ARCH @@ -2588,8 +2592,8 @@ native-xtools: .PHONY # polluting the cross-compiler build. The LLVM/GCC libs are skipped # here to avoid the problem but are kept in 'toolchain' so that # needed build tools are built. - ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no MK_GCC=no - ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no MK_GCC=no + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes ${NXBTNOTOOLS} + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries ${NXBTNOTOOLS} # Clean out improper TARGET=MACHINE files ${_+_}cd ${.CURDIR}/gnu/usr.bin/cc/cc_tools; ${NXBTMAKE} cleandir .if !defined(NO_OBJWALK)