aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2014-04-15 01:23:52 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2014-04-15 01:23:52 +0400
commite9bf9d56b2aa1d79e56a4f0accaf7f31a9822edc (patch)
treeb1f03f94055d5955e6585e56b115549e2a930548 /Makefile
parent655cf950bf9b8a9d0495c5031f94dcbd38fb7ca4 (diff)
parent71ebabdef041e78279dfc444364934aaccac040c (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 e18739715cf..a1b5ee4f280 100644
--- a/Makefile
+++ b/Makefile
@@ -621,6 +621,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
@@ -628,6 +629,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.