From eaf797a0cb0b5dac596e5627dbc8c6bfe5b523fe Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Mon, 11 Mar 2024 10:42:00 -0700 Subject: [PATCH] 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. Lustre-change: https://review.whamcloud.com/53991 Lustre-commit: 881cc6384a5e37f0e64b56c1b34563b87dcc210d Test-Parameters: trivial Fixes: d684885098 ("LU-16961 clang: plugins and build system integration") Signed-off-by: Shaun Tancheff Change-Id: I6ddedd82c6180ffd1c4134fda6af6df6bd23dd34 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54351 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- autoMakefile.am | 1 + cc-plugins/Makefile.am | 3 +++ config/Makefile.am | 1 + config/lustre-compiler-plugins.m4 | 8 +++----- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 0e517ac..168f503 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -14,6 +14,7 @@ DIST_SUBDIRS := ldiskfs \ @SNMP_DIST_SUBDIR@ \ 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 63804c6..19567b0 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,2 +1,3 @@ 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 -- 1.8.3.1