LU-16961 clang: plugins and build system integration

[fs/lustre-release.git] / config / lustre-toolchain.m4

diff --git a/config/lustre-toolchain.m4 b/config/lustre-toolchain.m4
index d8c85d8..571df1d 100644 (file)
--- a/config/lustre-toolchain.m4
+++ b/config/lustre-toolchain.m4
@@ -31,6 +31,7 @@ fi
 HOSTCC="$LLVM_PREFIX"clang"$LLVM_SUFFIX"
 HOSTCXX="$LLVM_PREFIX"clang++"$LLVM_SUFFIX"
 CC="$LLVM_PREFIX"clang"$LLVM_SUFFIX"
+CXX="$LLVM_PREFIX"clang++"$LLVM_SUFFIX"
 LD="$LLVM_PREFIX"ld.lld"$LLVM_SUFFIX"
 AR="$LLVM_PREFIX"llvm-ar"$LLVM_SUFFIX"
 NM="$LLVM_PREFIX"llvm-nm"$LLVM_SUFFIX"
@@ -179,6 +180,7 @@ AC_DEFUN([LTC_CC_NO_STRINGOP_OVERFLOW], [
 AC_DEFUN([LTC_TOOLCHAIN_CONFIGURE], [
 AC_REQUIRE([LTC_LLVM_TOOLCHAIN])
 AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CXX])
 
 AM_PROG_AS
 AC_CHECK_TOOLS(AR, ar)
@@ -213,6 +215,7 @@ EXTRA_KCFLAGS: $EXTRA_KCFLAGS
 
 LD:            $LD
 
+CXX:           $CXX
 CPPFLAGS:      $CPPFLAGS
 
 Type 'make' to build Lustre.