diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-08-17 17:13:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-08-17 17:13:07 +0300 |
| commit | c549530676c14fbe6bb201e62e57cfb1e945079d (patch) | |
| tree | 4d42c5a739742a4eb52bf1f4949b56b6d29a21c2 | |
| parent | 8d7e9db51f4c3eb259517ba9b86610b6ffd48c49 (diff) | |
| parent | e117bc4ff99b569e413f0b6046afacfc3ff38364 (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20150817.0
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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. |