aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-11-09 14:58:45 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-11-09 14:58:45 +0300
commit7439bc2a3f51eda7e695c292850d2f5494d20b27 (patch)
tree3d6a8f831eba6d2aae75cbc53b351b8033c3af11
parent3a22b2fbe2a06d43af1949b3a599bc6dfd3cd76c (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20151119.0tracking-llct-ll-20151112.0llct-20151109.0
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d5b37391195f..467032f1c700 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.