Date: Tue, 09 Dec 2025 16:05:54 +0000 From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 78ffea3bfe2b - main - devel/llvm13: don't build gold plugin when disabled Message-ID: <693848e2.35756.1ef08318@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=78ffea3bfe2b6f9b24f9331418a68a7fcb663b41 commit 78ffea3bfe2b6f9b24f9331418a68a7fcb663b41 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2025-12-09 16:04:27 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2025-12-09 16:05:36 +0000 devel/llvm13: don't build gold plugin when disabled Disabling the GOLD option didn't actually disable building the plugin, it just didn't install it in the package. Actually stop traversing into the directory when the option disabled so we don't end up needing devel/binutils. PR: 291247 Sponsored by: DARPA, AFRL --- devel/llvm13/Makefile | 3 ++- devel/llvm13/files/gold-off-llvm_tools_CMakeLists.txt | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 04e1325b5fae..8fdabe88d455 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -139,8 +139,9 @@ FLANG_IMPLIES= MLIR FLANG_PORTDOCS= flang FLANG_PLIST_DIRS= ${LLVM_DIR}/include/flang/Config GOLD_DESC= Build the LLVM Gold plugin for LTO -GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include +GOLD_EXTRA_PATCHES_OFF= ${PATCHDIR}/gold-off-llvm_tools_CMakeLists.txt LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker diff --git a/devel/llvm13/files/gold-off-llvm_tools_CMakeLists.txt b/devel/llvm13/files/gold-off-llvm_tools_CMakeLists.txt new file mode 100644 index 000000000000..59a4718e4143 --- /dev/null +++ b/devel/llvm13/files/gold-off-llvm_tools_CMakeLists.txt @@ -0,0 +1,10 @@ +--- llvm/tools/CMakeLists.txt.orig ++++ llvm/tools/CMakeLists.txt +@@ -29,7 +29,6 @@ + # requires targets specified in DEPENDS to exist before the call to + # ExternalProject_Add. + add_llvm_tool_subdirectory(lto) +-add_llvm_tool_subdirectory(gold) + add_llvm_tool_subdirectory(llvm-ar) + add_llvm_tool_subdirectory(llvm-config) + add_llvm_tool_subdirectory(llvm-lto)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693848e2.35756.1ef08318>