aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-09-24 18:04:42 -0700
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-09-24 18:04:42 -0700
commit850f78330c468bbfa5bf30f827c3a96ef6ba14e1 (patch)
tree1f6453f4a37bf18e1d60a3098551f60a333e34cf
parentb9de243c34d7dd8b85609363aee91e325e557258 (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20150925.0llct-20150924.0
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 84f4b31e3c6e..8ab7fb267942 100644
--- a/Makefile
+++ b/Makefile
@@ -651,6 +651,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
@@ -658,6 +659,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.