diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk
index ef3efa81963d..6062ce1d7666 100644
--- a/devel/boost-all/compiled.mk
+++ b/devel/boost-all/compiled.mk
@@ -1,59 +1,61 @@
 USE_LDCONFIG=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAKE_CMD?=	bjam
 MAKEFILE=	#
 MAKE_FLAGS=	#
 ALL_TARGET=	stage
 #USES+=		compiler:c++17-lang
 USE_CXXSTD=	gnu++17
 
 PLIST_SUB+=	BOOST_MAJOR_VER=${BOOST_MAJOR_VER} \
 		BOOST_MINOR_VER=${BOOST_MINOR_VER} \
 		BOOST_SHARED_LIB_VER=${BOOST_SHARED_LIB_VER}
 
 PKG_MESSAGE_FILE_THREADS=	${PORTSDIR}/devel/boost-all/pkg-message.threads
 PKG_MESSAGE_FILE_PYTHON=	${PORTSDIR}/devel/boost-all/pkg-message.python
 
 MAKE_ARGS=	--layout=system \
 		--prefix=${PREFIX} \
 		-d2
 
 # Our compiler-flags will be added AFTER those set by bjam. We remove
 # the optimization level, because Boost sets it itself (to -O3 in case
 # of gcc/g++):
 MAKE_ARGS+=	cxxflags="${CXXFLAGS:N-O*}" cflags="${CFLAGS:N-O*}"
 
 MAKE_ARGS+=	--toolset=${CHOSEN_COMPILER_TYPE} \
 		${_MAKE_JOBS}
 
 DEBUG_MAKE_ARGS=	debug
 DEBUG_MAKE_ARGS_OFF=	release
 
 MAKE_ARGS+=	threading=multi \
 		link=shared,static
 
 MAKE_ARGS+=	optimization=speed
 OPTIMIZED_CFLAGS_MAKE_ARGS=	inlining=full
 
 # ccache build fails when using precompiled headers, on a cached build.
 #
 # base gcc 4.2.1 fails when using precompiled headers on 11.0+ kernel.
 # https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 MAKE_ARGS+=	pch=off
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000 || \
-	(${OSVERSION} >= 1400000 && ${OSVERSION} < 1400097))
+.if ${OPSYS} == FreeBSD && \
+	((${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017) || \
+	(${OSVERSION} >= 1400000 && ${OSVERSION} < 1400509) || \
+	(${OSVERSION} >= 1300000 && ${OSVERSION} < 1303502))
 USES+=	llvm:build
 CHOSEN_COMPILER_TYPE=	clang
 .else
 USES+=	compiler:c++17-lang
 .endif
 
 post-patch:
 .if defined(USE_BINUTILS)
 	@${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} : <linkflags>-B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/src/user-config.jam
 .else
 	@${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} ;" >> ${WRKSRC}/tools/build/src/user-config.jam
 .endif