summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-17 02:15:34 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-17 02:15:34 +0300
commitd75a43c645c26ab58118bd35405666a12971350d (patch)
tree1416c3f00729d1c2088edbe16eb37652d5da27cf /tools
parenta480222f4c7cdafad22540f44487f009e359dfb8 (diff)
parentf73b3cc39c84220e6dccd463b5c8279b03514646 (diff)
downloadlinux-d75a43c645c26ab58118bd35405666a12971350d.tar.xz
Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool build fix from Ingo Molnar: "Fix objtool builds with more exotic, user-defined CFLAGS" * 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Clobber user CFLAGS variable
Diffstat (limited to 'tools')
-rw-r--r--tools/objtool/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 88158239622b..20f67fcf378d 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -35,7 +35,7 @@ INCLUDES := -I$(srctree)/tools/include \
-I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
-I$(srctree)/tools/objtool/arch/$(ARCH)/include
WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
-CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
+CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
# Allow old libelf to be used: