From nobody Mon May 01 20:47:26 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 4Q9FdW1fMNz49062; Mon, 1 May 2023 20:47:27 +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 4Q9FdW18TDz3FtQ; Mon, 1 May 2023 20:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682974047; 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=9Ni0Xmg5xVHphoHDT51QpkRp391fgCctIMQ2aT0o7p8=; b=RMOS/M/dQPxTTPPYQMB19xhT6rnhlDuSJJEevG87vnpQmZ8m4sPV5Vk8qnzddIKIcD0cKm 2eopPshVe+lBK4fHG0vUls7UG9GXnotZm49GCeX8p8NEpoyf0Iy2niOitOV60SAuwjINez qc1esVk0Q2/wdqwE5CBogBLdJ5nINjT1GzCmAancpwkNEf1rT1AOqDJ2OzIPwyzYnSwiLR cUFu7e2cufRjIfcPbJGfsRh3XDSA7y+DEmhsxle9Gww16kigBFcg6B33qwTqrXz3Pyn1G9 C129/My6NozJ0xvBrd1K2N9aEiIfWX2Y/RyklGbgcuqStygt6MLfOFKm5x1kxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682974047; 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=9Ni0Xmg5xVHphoHDT51QpkRp391fgCctIMQ2aT0o7p8=; b=sCAxsxqiJFS1PjGt4WdcMm9Wi8TAmFe8zTwNk5NFyhRq98/iMyL8IqW1JWJWy48aMbjJ8s 0SxMYW4sXpPfcU+23jQ4sr/sbiqVyu27CRWh47M2OwmLsOJKcEy2atAmvDHpQtTViyZ89G iT7nltu12xfzm5k0jlLGlkfGZaGXHUCt2uBWFQscgOMOtUMxIm8TyjkkrH5Q7/Be/WBDjq 19/PwDoR8ydrIQ3mperki7i0hcWgkx72rXRu43Wy+ae+DJhv8xF3snRZQY3dE9PaB1PsqY HilUM8TP+KlGFSrC3uIknBo17XqfbZy/+0eOpUnEtk+aH2B9CLA2rr92OTcMMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682974047; a=rsa-sha256; cv=none; b=fJoPHlOcYXYTGMY7hU715n4Z31Rb+6285XZA0A5lemPDF8IiKsGSpuBACevyUwCAEaGawx yf+qmUGOCXaVlZ0zMn+O7387UAb/KFzevYnTpznAbl2rFpRVRA1M0PQ70zRPFGOZ3n96F7 PPPusk7/ITysZY9/tZe8j3+xJPj0fhHp8DohnNxodthoBgdDvLME+7PsTkMRijWhoxhzWn yCC4/oSH9vh89IF6GSVYoTtS4WO7eqAeJa+8dFQDgaLSRD4C8IYgtAohlXyETXlxyfOwUT BFCFaEATZfshG4uKDgwiogNYmcEubZJcex2oZ2yaB4XAhn/r5J3RqGJclnGjDg== 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 4Q9FdW062rzKvM; Mon, 1 May 2023 20:47:27 +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 341KlQpQ018581; Mon, 1 May 2023 20:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341KlQVT018580; Mon, 1 May 2023 20:47:26 GMT (envelope-from git) Date: Mon, 1 May 2023 20:47:26 GMT Message-Id: <202305012047.341KlQVT018580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5f2e84015da7 - main - bsd.lib.mk: decouple lib*_pic.a from TOOLCHAIN build knob 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f2e84015da7a664bba0af7727349c9c3f6902ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2e84015da7a664bba0af7727349c9c3f6902ba commit 5f2e84015da7a664bba0af7727349c9c3f6902ba Author: Ed Maste AuthorDate: 2023-05-01 20:33:47 +0000 Commit: Ed Maste CommitDate: 2023-05-01 20:46:39 +0000 bsd.lib.mk: decouple lib*_pic.a from TOOLCHAIN build knob A user may use a tool chain from a package or just use an existing tool chain from a previous installation. There is no reason for this to disable the installation of lib${LIB}_pic.a. This also means we don't need to force MK_TOOLCHAIN=yes in lib/libc. This reverts part of commit c0f5aeb0329d71e6b02379133c0c9c0145c9afea. Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39917 --- lib/libc/Makefile | 3 --- share/mk/bsd.lib.mk | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index e2a8f1473bf3..2b06bc1b3c5a 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -6,9 +6,6 @@ SHLIBDIR?= /lib .include -# Force building of libc_pic.a -MK_TOOLCHAIN= yes - LIBC_SRCTOP?= ${.CURDIR} # Pick the current architecture directory for libc. In general, this is diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1d4a97134d41..8e5035f6db41 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -378,7 +378,7 @@ ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL} .endif .endif #defined(SHLIB_NAME) -.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB_PRIVATE}${LIB}_pic.a lib${LIB_PRIVATE}${LIB}_pic.a: ${SOBJS} @@ -540,7 +540,7 @@ _libinstall: .endif # SHLIB_LDSCRIPT .endif # SHLIB_LINK .endif # SHIB_NAME -.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ .endif