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 --- target/x86/sys-available/toolchain-i686 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 target/x86/sys-available/toolchain-i686 (limited to 'target/x86/sys-available/toolchain-i686') diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 deleted file mode 100644 index b7c3be238..000000000 --- a/target/x86/sys-available/toolchain-i686 +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 - bool "Toolchain only" - select ADK_x86 - select ADK_toolchain_x86 - select ADK_CPU_I686 - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Build a x86 toolchain (i686 optimized). - -- cgit v1.2.3