diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 15:20:35 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 15:20:35 -0400 |
| commit | 7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch) | |
| tree | 879f18ccbe274122f2d4f095b43cbc7f953e0ada /scripts/gcc-plugins | |
| parent | 48e315618dc4dc8904182cd221e3d395d5d97005 (diff) | |
| parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'scripts/gcc-plugins')
| -rw-r--r-- | scripts/gcc-plugins/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile index e2ff425f4c7e..326254653bd0 100644 --- a/scripts/gcc-plugins/Makefile +++ b/scripts/gcc-plugins/Makefile | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | PLUGINCC := $(CONFIG_PLUGIN_HOSTCC:"%"=%) | ||
| 2 | GCC_PLUGINS_DIR := $(shell $(CC) -print-file-name=plugin) | 3 | GCC_PLUGINS_DIR := $(shell $(CC) -print-file-name=plugin) |
| 3 | 4 | ||
| 4 | ifeq ($(PLUGINCC),$(HOSTCC)) | 5 | ifeq ($(PLUGINCC),$(HOSTCC)) |
| @@ -13,10 +14,6 @@ else | |||
| 13 | export HOST_EXTRACXXFLAGS | 14 | export HOST_EXTRACXXFLAGS |
| 14 | endif | 15 | endif |
| 15 | 16 | ||
| 16 | ifneq ($(CFLAGS_KCOV), $(SANCOV_PLUGIN)) | ||
| 17 | GCC_PLUGIN := $(filter-out $(SANCOV_PLUGIN), $(GCC_PLUGIN)) | ||
| 18 | endif | ||
| 19 | |||
| 20 | export HOSTLIBS | 17 | export HOSTLIBS |
| 21 | 18 | ||
| 22 | $(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h | 19 | $(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h |