aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2016-06-11 12:09:28 -0400
committerMichal Marek <mmarek@suse.com>2016-07-26 18:08:54 -0400
commita519167e753e6a89476115375b65a7eb6ec485b3 (patch)
tree83a143dea6083302a945e17f8a2175f16d122470
parent228d96c603cf53e32f672c0e459d2adbc5a4609a (diff)
gcc-plugins: disable under COMPILE_TEST
Since adding the gcc plugin development headers is required for the gcc plugin support, we should ease into this new kernel build dependency more slowly. For now, disable the gcc plugins under COMPILE_TEST so that all*config builds will skip it. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r--arch/Kconfig1
-rw-r--r--lib/Kconfig.debug4
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 05f1e95b796d..cae4bc587eae 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -366,6 +366,7 @@ config HAVE_GCC_PLUGINS
366menuconfig GCC_PLUGINS 366menuconfig GCC_PLUGINS
367 bool "GCC plugins" 367 bool "GCC plugins"
368 depends on HAVE_GCC_PLUGINS 368 depends on HAVE_GCC_PLUGINS
369 depends on !COMPILE_TEST
369 help 370 help
370 GCC plugins are loadable modules that provide extra features to the 371 GCC plugins are loadable modules that provide extra features to the
371 compiler. They are useful for runtime instrumentation and static analysis. 372 compiler. They are useful for runtime instrumentation and static analysis.
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index b7827dca3fec..7936e5e4da9d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -708,8 +708,8 @@ config KCOV
708 bool "Code coverage for fuzzing" 708 bool "Code coverage for fuzzing"
709 depends on ARCH_HAS_KCOV 709 depends on ARCH_HAS_KCOV
710 select DEBUG_FS 710 select DEBUG_FS
711 select GCC_PLUGINS 711 select GCC_PLUGINS if !COMPILE_TEST
712 select GCC_PLUGIN_SANCOV 712 select GCC_PLUGIN_SANCOV if !COMPILE_TEST
713 help 713 help
714 KCOV exposes kernel code coverage information in a form suitable 714 KCOV exposes kernel code coverage information in a form suitable
715 for coverage-guided fuzzing (randomized testing). 715 for coverage-guided fuzzing (randomized testing).