Toolchain: clang/llvm release versions are tightly coupled, so use same version in kconfig

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

4 files changed, 63 insertions, 26 deletions

diff --git a/kconfig/llvm/clang-llvm.kconfig b/kconfig/llvm/clang-llvm.kconfig
new file mode 100644
index 0000000..a0bb6c3
--- /dev/null
+++ b/kconfig/llvm/clang-llvm.kconfig
@@ -0,0 +1,43 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         clang-llvm.kconfig
+# \brief	clang-llvm.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         December 2012
+################################################################################
+
+#
+# clang/llvm version
+#
+choice
+	prompt "Version of llvm you wish"
+	help
+	 Version of llvm you wish
+
+	config EMBTK_CLANG_LLVM_VERSION_3_2
+		bool "clang/llvm-3.2"
+		select EMBTK_LLVM_VERSION_3_2
+		select EMBTK_CLANG_VERSION_3_2
+	config EMBTK_CLANG_LLVM_VERSION_GIT
+		bool "Use clang/llvm git repository"
+		help
+		 Answer Y here if you want to build your toolchain based on
+		 clang/llvm sources from its GIT repository.
+endchoice
diff --git a/kconfig/llvm/clang.kconfig b/kconfig/llvm/clang.kconfig
index a52e705..c66600f 100644
--- a/kconfig/llvm/clang.kconfig
+++ b/kconfig/llvm/clang.kconfig
@@ -30,20 +30,17 @@ config EMTK_HAVE_CLANG
 #
 # clang version
 #
-choice
-	prompt "Version of clang you wish"
-	help
-	 Version of clang you wish
 
-	config EMBTK_CLANG_VERSION_3_2
-		bool "clang-3.2"
-		select EMBTK_CLANG_NEED_PATCH
-	config EMBTK_CLANG_VERSION_GIT
-		bool "Use clang git repository"
-		help
-		 Answer Y here if you want to build your toolchain based on
-		 clang sources from its GIT repository.
-endchoice
+config EMBTK_CLANG_VERSION_3_2
+	bool
+	select EMBTK_CLANG_NEED_PATCH
+
+config EMBTK_CLANG_VERSION_GIT
+	bool "Use clang git repository"
+	depends on EMBTK_CLANG_LLVM_VERSION_GIT
+	help
+	 Answer Y here if you want to build your toolchain based on
+	 clang sources from its GIT repository.
 
 #
 # GIT repository options
diff --git a/kconfig/llvm/llvm.kconfig b/kconfig/llvm/llvm.kconfig
index b8b9463..b937746 100644
--- a/kconfig/llvm/llvm.kconfig
+++ b/kconfig/llvm/llvm.kconfig
@@ -30,20 +30,16 @@ config EMTK_HAVE_LLVM
 #
 # llvm version
 #
-choice
-	prompt "Version of llvm you wish"
-	help
-	 Version of llvm you wish
+config EMBTK_LLVM_VERSION_3_2
+	bool
+	select EMBTK_LLVM_NEED_PATCH
 
-	config EMBTK_LLVM_VERSION_3_2
-		bool "llvm-3.2"
-		select EMBTK_LLVM_NEED_PATCH
-	config EMBTK_LLVM_VERSION_GIT
-		bool "Use llvm git repository"
-		help
-		 Answer Y here if you want to build your toolchain based on
-		 llvm sources from its GIT repository.
-endchoice
+config EMBTK_LLVM_VERSION_GIT
+	bool "Use llvm git repository"
+	depends on EMBTK_CLANG_LLVM_VERSION_GIT
+	help
+	 Answer Y here if you want to build your toolchain based on
+	 llvm sources from its GIT repository.
 
 #
 # GIT repository options
diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig
index 887d8d6..7245839 100644
--- a/kconfig/toolchain.kconfig
+++ b/kconfig/toolchain.kconfig
@@ -116,6 +116,7 @@ if EMBTK_LLVM_ONLY_TOOLCHAIN || EMBTK_GCC_AND_LLVM_TOOLCHAIN
 comment "------------------------------------------"
 comment "--- clang/llvm versions"
 comment "------------------------------------------"
+source kconfig/llvm/clang-llvm.kconfig
 source kconfig/llvm/llvm.kconfig
 source kconfig/llvm/clang.kconfig
 endif