aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-12-01 18:38:44 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-12-01 18:38:44 +0300
commit66c9cc4ca499ccf276c0f44dab4da61869d0e243 (patch)
tree614b25708363cbe5f7d9ce95d44e87f87ccc549a
parent9674e61a749729a4957fd67a08f7268ced94b771 (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20151201.1
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 904a1d65df30..f30a325c1bde 100644
--- a/Makefile
+++ b/Makefile
@@ -652,6 +652,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
ifeq ($(call cc-option, $(stackp-flag)),)
$(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \
-fstack-protector not supported by compiler)
+ stackp-flag :=
endif
else
ifdef CONFIG_CC_STACKPROTECTOR_STRONG
@@ -659,6 +660,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG
ifeq ($(call cc-option, $(stackp-flag)),)
$(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
-fstack-protector-strong not supported by compiler)
+ stackp-flag :=
endif
else
# Force off for distro compilers that enable stack protector by default.