projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/arizona', 'asoc/fix/dpcm...
[cascardo/linux.git]
/
tools
/
perf
/
config
/
Makefile
diff --git
a/tools/perf/config/Makefile
b/tools/perf/config/Makefile
index
e5959c1
..
511141b
100644
(file)
--- a/
tools/perf/config/Makefile
+++ b/
tools/perf/config/Makefile
@@
-181,7
+181,11
@@
LDFLAGS += -Wl,-z,noexecstack
EXTLIBS = -lpthread -lrt -lm -ldl
+ifeq ($(FEATURES_DUMP),)
include $(srctree)/tools/build/Makefile.feature
+else
+include $(FEATURES_DUMP)
+endif
ifeq ($(feature-stackprotector-all), 1)
CFLAGS += -fstack-protector-all