summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-06-15 13:59:55 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-06-15 13:59:55 +0300
commit50b7043a496fc4e83e62def06644577e2dd44a04 (patch)
tree08525896cd68a8bca9185b87954c9dd2d46f110f /Makefile
parent1ff40c3f754286a08631a2251e937197f507ca68 (diff)
parent1aa3ceb9f88e0486f52a676ad72defbf07df8177 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-tracking
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3ba504496cb..641dfa95140 100644
--- a/Makefile
+++ b/Makefile
@@ -656,6 +656,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
@@ -663,6 +664,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.