From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- toolchain/gcc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolchain/gcc/Makefile') 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 -- cgit v1.2.3