From: Shaun Tancheff <shaun.tancheff@hpe.com>
Date: Sat, 10 Feb 2024 08:02:17 +0000 (+0700)
Subject: LU-17522 build: Distribute clang build infrastructure
X-Git-Tag: 2.15.62~176
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F53991%2F2;p=fs%2Flustre-release.git

LU-17522 build: Distribute clang build infrastructure

Macro files:
    lustre-toolchain.m4 lustre-compiler-plugins.m4
and directory:
   cc-plugins

Should be included in distributed files, unconditionally.

Test-Parameters: trivial
Fixes: d684885098 ("LU-16961 clang: plugins and build system integration")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I6ddedd82c6180ffd1c4134fda6af6df6bd23dd34
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53991
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index 064ec0a0..b27984a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -22,6 +22,7 @@ DIST_SUBDIRS := ldiskfs \
 	libcfs \
 	lnet \
 	lustre \
+	cc-plugins \
 	config
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/cc-plugins/Makefile.am b/cc-plugins/Makefile.am
index dd9f405..59625d7 100644
--- a/cc-plugins/Makefile.am
+++ b/cc-plugins/Makefile.am
@@ -8,7 +8,10 @@
 # Automake file for compiler plugins.
 #
 
+EXTRA_DIST =
+
 if CC_PLUGINS
 lib_LTLIBRARIES = libfindstatic.la
 libfindstatic_la_SOURCES = FindStatic.cpp
+EXTRA_DIST += FindStatic.cpp
 endif # CC_PLUGINS
diff --git a/config/Makefile.am b/config/Makefile.am
index 128d9e9..7bb4a62 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -10,3 +10,4 @@
 
 EXTRA_DIST  = lustre-build.m4 lustre-build-linux.m4
 EXTRA_DIST += lustre-build-ldiskfs.m4 lustre-build-zfs.m4
+EXTRA_DIST += lustre-toolchain.m4 lustre-compiler-plugins.m4
diff --git a/config/lustre-compiler-plugins.m4 b/config/lustre-compiler-plugins.m4
index 6f58dbd..e681cfb 100644
--- a/config/lustre-compiler-plugins.m4
+++ b/config/lustre-compiler-plugins.m4
@@ -38,9 +38,7 @@ LPLUG_ENABLE
 # files that should be generated with AC_OUTPUT
 #
 AC_DEFUN([LPLUG_CONFIG_FILES], [
-AS_IF([test "x$enable_compiler_plugins" == "xyes"], [
-AC_CONFIG_FILES([
-cc-plugins/Makefile
-])
-], [])
+	AC_CONFIG_FILES([
+		cc-plugins/Makefile
+	])
 ]) # LPLUG_CONFIG_FILES