From nobody Thu May 19 15:07:00 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 E6C921B34CF4; Thu, 19 May 2022 15:07:00 +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 4L3tVr6845z4h63; Thu, 19 May 2022 15:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652972820; 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=AnRh96yowB+MNxayJcR8t1IzS2qhqHVgVB4rljfaMhQ=; b=hpOxXCJ9AnsmU0TRwHp3cTVdrvRwyQNRdkwbU7zl4oVjk/w7VDjCSXJg3VvlJ28NSKORJi 7DhvFE1f8UdcHv+4x/VVhYlivtiJZxHAC15NcIqwsWb2m0djCXe2fz+uZJoGhMxsx6TRId vaMzV3wlS5TkA14OWEWOApFZT4aW0vg4OD/aUb6rQuqnmz3V9AcZ7iKok6MU0/aDkV1l6l sLS8wYzWE/D4CpIITdOjFEM9qj251y7hCHzlNRaMLqMyvvJoJlVs/ign7XcbmqwpraoeNp P3JlahqchvvjjnA9N5CVXHDeCwg03QZppoArDRG9f9NPLnmaAOwWDm80xyUXIQ== 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 AEF822003E; Thu, 19 May 2022 15:07:00 +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 24JF70Pp011533; Thu, 19 May 2022 15:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JF70u5011532; Thu, 19 May 2022 15:07:00 GMT (envelope-from git) Date: Thu, 19 May 2022 15:07:00 GMT Message-Id: <202205191507.24JF70u5011532@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: 3afe1c2e1817 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3afe1c2e181712afd0120e14267f92050de434f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652972820; 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=AnRh96yowB+MNxayJcR8t1IzS2qhqHVgVB4rljfaMhQ=; b=o2Yf5g0ZPE+BJbmLBeMvIJ4GEJGA1TaVgNeLj5qTM5H035wZqo/J4ETKe7o425UL7CrSp2 paPw2eWkdIYWTIZARD5cK9LDjf3PyLtc+IDzczLpJcBTC5FeKrhvp1niYYJMlNluBHhIN2 ovneUw7S67YLFxGT6Lc8PLbyiKbOAlUySRhwiWmuROdez9cx/qlb0xBNoHwGi4ncRQQjGC rqUuRcypU9ZKXpgAoifnOPKX9R7PyhoqrnI0OpwzL0nkIl2tMQhLcBKrWZom+AgqbaReBH h1Ro/eecMMWMEXZznLGIuNEZjUa6cNHHFkIF/9Buj0tuqAvOCKrntIY0FsuTiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652972820; a=rsa-sha256; cv=none; b=wGyUJjPa63IQw7lLvM3RyS4BPvwKLOsvsndxUHSt1NetwRLqqClzjb4b9NkOxps23hEpz0 W3+cdpEHW2TJnQgC5sWo7HpgZkPrjw2GRviManlMaUvMmKcGA5cm9tFds3llwXbuXuw9lY oK4z7AgYie5evZ4CuGdMcJjRf7NoC5vnf+g7UN20OLOFrfF8OCMgIEsGip+f6as6wEjQ0q jOTHWeirb/pezVuvTJOgqRBlDFS+ALwRtYuekoYKsD3nYNV9R3p/pq1ZK/f9p61CFcmfrH P81SL4UKwQy/KIvr1Dhzf/q+qWxPABwGdFcDGLg+QMqCYlW7ls1+678hUNPsnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3afe1c2e181712afd0120e14267f92050de434f7 commit 3afe1c2e181712afd0120e14267f92050de434f7 Author: Kyle Evans AuthorDate: 2021-10-13 09:21:28 +0000 Commit: Kyle Evans CommitDate: 2022-05-19 15:05:53 +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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b8431b5abe09..d378fbe466e3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2807,6 +2807,10 @@ NXBMAKEARGS+= \ NXBMAKEENV+= \ MAKEOBJDIRPREFIX= +# 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 + .if make(native-xtools*) && \ (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH)) .error Missing NXB_TARGET / NXB_TARGET_ARCH @@ -2846,11 +2850,11 @@ native-xtools: .PHONY # Populate includes/libraries sysroot that produce native binaries. # This is split out from 'toolchain' above mostly so that target LLVM # libraries have a proper LLVM_DEFAULT_TARGET_TRIPLE without - # polluting the cross-compiler build. The LLVM/GCC libs are skipped + # polluting the cross-compiler build. The LLVM 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 - ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes ${NXBTNOTOOLS} + ${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries ${NXBTNOTOOLS} .if !defined(NO_OBJWALK) ${_+_}cd ${.CURDIR}; ${NXBMAKE} _obj .endif