From nobody Wed Sep 13 05:18:23 2023 X-Original-To: dev-commits-ports-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 4RlpdD29pKz4ssfh; Wed, 13 Sep 2023 05:18:24 +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 4RlpdD1fg2z3dTY; Wed, 13 Sep 2023 05:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694582304; 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=ud/q72LDsE3v7do6Q7PEOIADZGZ7lYE5Lv1zAphEjzA=; b=lAZdtvLEBybH7kPxj8r0YL8mvy6iAZxEmrJ0Hcc7gMF9HqvGsu7vtVL585Zw+rdFUCvwA3 7JfL9pLTq1igzqrG838SNpaj3CxaRNCbUwRlX0RVVXeV9pLZXBxQYNptaGujk1yS6p+yJ8 1n+KIha2wBfCDrOAQhUxm0iDY6mJ5o+DyrK2gaYMDQtLc++K90yzL3b3ZTe9r7v92NR+aG 8cCnoNV4wr5YoIgVXOfjny3YW60vHNs0celwfiYQOWGL5Nrlbucz6xNMyp1kofoH19aSTU Z0RnDs/kbz73uP9REUpD9wwPPRLuwTli05KQGI7zb/Tg2QqUtYw53F4fZ3SPWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694582304; a=rsa-sha256; cv=none; b=vyVC62MPw6MPHUCtmDXERZcQPIvS05qoHEb3Idm+GzMkf1iWz71zQ6Nn/aCFjJiBB8UvOD y81X554mjwFheEQU6F26s2XqP4gGURgWemVvO9dW0uLc/CMTomn+CVnSPVlNuA2/jG/ZIN qWnp5rj+mbkY+uenGPkGWfiA3zwQ1e7ajRDZbZ+kJQQDXBH9dAoe4rmrDzy9LNm4qFlTtI tlY30HUoI6rDDMWulo411q2dfbpsRIBCvS9IlnIeZgeA6capKIpQQbR7VI/qYlw/e3r6N2 /hk8tRh2a1qrKq0oRRXM/DD6/ZHmVqtCs/Cruj2Lx3B1yfkJ913w//IRdqc1NA== 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=1694582304; 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=ud/q72LDsE3v7do6Q7PEOIADZGZ7lYE5Lv1zAphEjzA=; b=mVVtN1xZZWUP2lI0rUiXoy7ffaOiD0/0dzCdmFQmIprBXVdz622324CdO1Inj2L2LxF01F CRDTwHoCg8lTJbBdZFbyU9bAOSbppsVGzYEmsD4s9iG5wPTUT/7+6oCxmbGdhG+2U3CLQ8 jVjTJvgU1y4uX2ovYAs+hmNht42Qc2qkEf2X/VI62pesYoV/Advs/P8EA6jFxWvsYNWECc YDJq0MUpfJQ1nhdjUvyrnQPbCOKvyYYMLf01MBXmXF6Yca6SdOGxFUemuZk295MlX3rGav YaR+hZ4qQDR2IE6Wwy4NTdCDXOwBDAsl6Y1S0TdyOjUBsR8rS1KIU683ldNBNg== 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 4RlpdD0hvxz11Wq; Wed, 13 Sep 2023 05:18:24 +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 38D5IOge018108; Wed, 13 Sep 2023 05:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D5INm2018105; Wed, 13 Sep 2023 05:18:23 GMT (envelope-from git) Date: Wed, 13 Sep 2023 05:18:23 GMT Message-Id: <202309130518.38D5INm2018105@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4df0e66a3662 - main - llvm.mk: add export/noexport to handle CC/CXX/CPP exports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4df0e66a3662ac9d427c2dcd79eb8555236083dd Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4df0e66a3662ac9d427c2dcd79eb8555236083dd commit 4df0e66a3662ac9d427c2dcd79eb8555236083dd Author: Tobias C. Berner AuthorDate: 2023-07-10 18:57:28 +0000 Commit: Tobias C. Berner CommitDate: 2023-09-13 05:16:58 +0000 llvm.mk: add export/noexport to handle CC/CXX/CPP exports Reviewed by: bofh Differential Revision: https://reviews.freebsd.org/D37747 --- CHANGES | 7 +++++++ Mk/Uses/llvm.mk | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/CHANGES b/CHANGES index 2f6c9a61499d..bc1188ea4016 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,13 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20230823: +AUTHOR: tcberner@FreeBSD.org + + USES=llvm.mk now supports 'export' (default) and 'noexport' arguments. + When export is set, CC, CXX and CPP will be set to the path corresponding + to the chosen llvm-version. + 20230821: AUTHOR: jhale@FreeBSD.org diff --git a/Mk/Uses/llvm.mk b/Mk/Uses/llvm.mk index 931ad99156f8..54cd2364255b 100644 --- a/Mk/Uses/llvm.mk +++ b/Mk/Uses/llvm.mk @@ -14,6 +14,10 @@ # min=number: use specified min if ${LLVM_DEFAULT} is lower # max=number: use specified max if ${LLVM_DEFAULT} is higher # +# * environment +# export: do export CC, CXX,... variables [default] +# noexport: do not export CC,CXX,... variables +# # An example usage might be: # USES= llvm # or @@ -35,6 +39,7 @@ _INCLUDE_USES_LLVM_MK= YES _LLVM_MK_VALID_VERSIONS= 10 11 12 13 14 15 16 _LLVM_MK_VALID_CONSTRAINTS= min max _LLVM_MK_VALID_MODES= build run lib +_LLVM_MK_VALID_EXPORTS= export noexport # === parse mode arguments === _LLVM_MK_MODES= # empty @@ -66,6 +71,21 @@ _LLVM_MK_VERSION= ${LLVM_DEFAULT} . endif . endif +# === parse environment arguments === +_LLVM_MK_EXPORT= # empty +. for _export in ${_LLVM_MK_VALID_EXPORTS} +. if ${llvm_ARGS:M${_export}} +. if !empty(_LLVM_MK_EXPORT) +BROKEN= USES=llvm:${llvm_ARGS} contains multiple export definitions +. else +_LLVM_MK_EXPORT= ${_export} +. endif +. endif +. endfor +. if empty(_LLVM_MK_EXPORT) +_LLVM_MK_EXPORT= export +. endif + # === handle constraints === . for _constraint in ${_LLVM_MK_VALID_CONSTRAINTS} _version= ${llvm_ARGS:M${_constraint}=[0-9]*:S/${_constraint}=//} @@ -115,4 +135,10 @@ LLVM_LIBLLVM= ${_LLVM_MK_LIBLLVM} LLVM_VERSION= ${_LLVM_MK_VERSION} LLVM_PREFIX= ${_LLVM_MK_PREFIX} +. if empty(_LLVM_MK_EXPORT:Mnoexport) +CC= ${LLVM_PREFIX}/bin/clang +CXX= ${LLVM_PREFIX}/bin/clang++ +CPP= ${LLVM_PREFIX}/bin/clang-cpp +. endif + .endif