diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /mk/vars.mk | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 30bf39247..12b26084d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -113,13 +113,13 @@ TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static endif -ifneq ($(ADK_TOOLCHAIN_USE_SSP),) -TARGET_CFLAGS+= -fstack-protector -TARGET_CXXFLAGS+= -fstack-protector -TARGET_LDFLAGS+= -fstack-protector +ifneq ($(ADK_TARGET_USE_SSP),) +TARGET_CFLAGS+= -fstack-protector-all +TARGET_CXXFLAGS+= -fstack-protector-all +TARGET_LDFLAGS+= -fstack-protector-all endif -ifneq ($(ADK_TOOLCHAIN_USE_LTO),) +ifneq ($(ADK_TARGET_USE_LTO),) TARGET_CFLAGS+= -flto TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto |