On Fri, Sep 04, 2026 at 09:17:22PM -0400, Brad Smith wrote:
> Garbage collect the GCC bits in LLVM that has not been functional
> since LLVM 13.
One more spot.
Index: lang/clang/clang.port.mk
===================================================================
RCS file: /cvs/ports/lang/clang/clang.port.mk,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 clang.port.mk
--- lang/clang/clang.port.mk 25 Jun 2026 07:29:51 -0000 1.47
+++ lang/clang/clang.port.mk 17 Sep 2026 00:05:03 -0000
@@ -60,14 +60,7 @@ COMPILER_LINKS += g++ ${LOCALBASE}/bin/c
c++ ${LOCALBASE}/bin/clang++-${MODCLANG_VERSION} \
clang++ ${LOCALBASE}/bin/clang++-${MODCLANG_VERSION}
-. if ${_MODCLANG_ARCH_CLANG:L} == "no"
-# uses libestdc++
-MODULES += gcc4
-MODCLANG_CPPLIBDEP = ${MODGCC4_CPPLIBDEP}
-LIB_DEPENDS += ${MODCLANG_CPPLIBDEP}
-MODCLANG_CPPWANTLIB = ${MODGCC4_CPPWANTLIB}
-LIBECXX = ${MODCLANG_CPPWANTLIB}
-. elif ${MODCLANG_CPPLIB:L} == "yes"
+. if ${MODCLANG_CPPLIB:L} == "yes"
# uses libec++
MODCLANG_CPPLIBDEP = ${MODCLANG_LIB_DEPENDS},-libcxx
LIB_DEPENDS += ${MODCLANG_CPPLIBDEP}
Index: devel/llvm/Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/llvm/Makefile.inc,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile.inc
--- devel/llvm/Makefile.inc 26 Jun 2026 15:49:12 -0000 1.34
+++ devel/llvm/Makefile.inc 17 Sep 2026 00:05:03 -0000
@@ -101,10 +101,6 @@ BUILD_DEPENDS += devel/swig \
textproc/py-sphinx \
textproc/py-recommonmark
-.if !${PROPERTIES:Mclang}
-RUN_DEPENDS += lang/gcc/${MODGCC4_VERSION},-c++
-.endif
-
CONFIGURE_STYLE += cmake
CONFIGURE_ARGS += \
-DCMAKE_INSTALL_PREFIX="${LOCALBASE}/${LLVM_BASE}" \
@@ -171,13 +167,8 @@ MODPY_ADJ_FILES += \
../clang/tools/scan-view/bin/scan-view \
../clang/utils/hmaptool/hmaptool
-# XXX sync
-GCC_VER = 15.2.0
-# do not include OSREV
-GCC_CONFIG = ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd
-
CLANG_INCLUDE_PATH = ${LLVM_BASE}/lib/clang/${LLVM_MAJOR}/include
-SUBST_VARS += CLANG_INCLUDE_PATH GCC_VER GCC_CONFIG
+SUBST_VARS += CLANG_INCLUDE_PATH
# hack to disable the use of -Bsymbolic-functions
.if ${PROPERTIES:Mlld}
@@ -188,8 +179,7 @@ OPENBSD_LD_IS_LLD = FALSE
SUBST_VARS += OPENBSD_LD_IS_LLD
pre-configure:
- ${SUBST_CMD} ${WRKDIST}/clang/lib/Driver/ToolChains/OpenBSD.cpp \
- ${WRKDIST}/clang/tools/clang-shlib/CMakeLists.txt \
+ ${SUBST_CMD} ${WRKDIST}/clang/tools/clang-shlib/CMakeLists.txt \
${WRKDIST}/clang/tools/clang-format/clang-format-sublime.py \
${WRKDIST}/clang/tools/clang-format/clang-format.py \
${WRKDIST}/clang/tools/clang-format/git-clang-format \
Index: lang/gcc/16/Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/16/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- lang/gcc/16/Makefile 3 Sep 2026 06:52:09 -0000 1.18
+++ lang/gcc/16/Makefile 17 Sep 2026 00:05:03 -0000
@@ -1,5 +1,5 @@
# When updating/switching to a new version, remember to adapt:
-# devel/llvm, sysutils/trash-d, devel/meson and lang/gdmd
+# sysutils/trash-d, devel/meson and lang/gdmd
# not tested: alpha, hppa, mips64el
ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
