Merge tag 'gcc-plugins-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (90e0a47b) · Commits · 戴 / test

Pull gcc-plugins fix from Kees Cook: "Build flexibility fix: allow builds to disable plugins even when plugins available (Arnd Bergmann)" * tag 'gcc-plugins-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: gcc-plugins: make it possible to disable CONFIG_GCC_PLUGINS again

scripts/gcc-plugins/Kconfig

+4 −5

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@ config HAVE_GCC_PLUGINS
		An arch should select this symbol if it supports building with
		GCC plugins.

		config GCC_PLUGINS
		bool
		menuconfig GCC_PLUGINS
		bool "GCC plugins"
		depends on HAVE_GCC_PLUGINS
		depends on PLUGIN_HOSTCC != ""
		default y
		@@ -25,8 +25,7 @@ config GCC_PLUGINS

		See Documentation/core-api/gcc-plugins.rst for details.

		menu "GCC plugins"
		depends on GCC_PLUGINS
		if GCC_PLUGINS

		config GCC_PLUGIN_CYC_COMPLEXITY
		bool "Compute the cyclomatic complexity of a function" if EXPERT
		@@ -113,4 +112,4 @@ config GCC_PLUGIN_ARM_SSP_PER_TASK
		bool
		depends on GCC_PLUGINS && ARM

		endmenu
		endif

Admin message