summaryrefslogtreecommitdiff
path: root/toolchain/gcc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
commit2735fdf97305e110eba8e776f8728a52ae886c05 (patch)
tree0ce26ce1066bd7260625ca641b1e64c99015f47f /toolchain/gcc
parent65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff)
resolve merge conflict
Diffstat (limited to 'toolchain/gcc')
-rw-r--r--toolchain/gcc/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 0814b16c8..d90f4fe3a 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -65,13 +65,13 @@ GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib
endif
endif
-ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y)
GCC_FINAL_CONFOPTS+= --enable-libssp
else
GCC_FINAL_CONFOPTS+= --disable-libssp
endif
-ifeq ($(ADK_TOOLCHAIN_GCC_LTO),y)
+ifeq ($(ADK_TOOLCHAIN_WITH_LTO),y)
GCC_FINAL_CONFOPTS+= --enable-lto
else
GCC_FINAL_CONFOPTS+= --disable-lto