From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 23 May 2014 16:39:17 +0200
Subject: resolve merge conflict

---
 toolchain/binutils/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolchain/binutils')

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 0a41fc9f3..7ceda3d51 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -6,19 +6,19 @@ include Makefile.inc
 include ../rules.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
-ifeq ($(ADK_TOOLCHAIN_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y)
 CONFOPTS+=		--enable-libssp
 else
 CONFOPTS+=		--disable-libssp
 endif
 
-ifeq ($(ADK_TOOLCHAIN_LTO),y)
+ifeq ($(ADK_TOOLCHAIN_WITH_LTO),y)
 CONFOPTS+=		--enable-lto
 else
 CONFOPTS+=		--disable-lto
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GOLD),y)
+ifeq ($(ADK_TOOLCHAIN_WITH_GOLD),y)
 CONFOPTS+=		--enable-gold
 else
 CONFOPTS+=		--disable-gold
-- 
cgit v1.2.3