diff mbox

[Trusty,SRU] Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled

Message ID 1477594573-9934-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner Oct. 27, 2016, 6:56 p.m. UTC 
From: Fathi Boudra <fathi.boudra@linaro.org>

BugLink: http://bugs.launchpad.net/bugs/1636625

An extra parenthesis typo introduced in 19952a92037e ("stackprotector:
Unify the HAVE_CC_STACKPROTECTOR logic between architectures") is
causing the following error when CONFIG_CC_STACKPROTECTOR_REGULAR is
enabled:

  Makefile:608: Cannot use CONFIG_CC_STACKPROTECTOR: -fstack-protector not supported by compiler
  Makefile:608: *** missing separator.  Stop.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 27b2a49a1493f5199a4c2f84abc6aebf81184e2b)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Seth Forshee Oct. 28, 2016, 9:57 p.m. UTC | #1
Joseph Salisbury Oct. 31, 2016, 8:25 p.m. UTC | #2
Tim Gardner Nov. 3, 2016, 9:36 p.m. UTC | #3
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 8c850a9..915c8b7 100644
--- a/Makefile
+++ b/Makefile
@@ -612,7 +612,7 @@  ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
   stackp-flag := -fstack-protector
   ifeq ($(call cc-option, $(stackp-flag)),)
     $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
-	      -fstack-protector not supported by compiler))
+             -fstack-protector not supported by compiler)
   endif
 else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
   stackp-flag := -fstack-protector-strong