Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-tracking
diff --git a/Makefile b/Makefile
index 904a1d6..f30a325 100644
--- a/Makefile
+++ b/Makefile
@@ -652,6 +652,7 @@
   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 @@
   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.