From 5a6f29c1d12064eba221809c13175ebf3d327321 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 1 Apr 2010 19:45:28 +0200
Subject: config: do not force setting kernel and arch

In backend mode, only enforce the arch and/or kernel selection if the
upper-layer build system effectively forces the selection.

diff --git a/config/backend.in b/config/backend.in
index 9151858..7dcf4e3 100644
--- a/config/backend.in
+++ b/config/backend.in
@@ -9,25 +9,10 @@ config BACKEND
     default y if IS_A_BACKEND =  "y" || IS_A_BACKEND =  "Y"
     default n if IS_A_BACKEND != "y" && IS_A_BACKEND != "Y"
 
-config BACKEND_ERROR
-    bool
-
 config BACKEND_ARCH
     string
     option env="CT_BACKEND_ARCH"
 
-if BACKEND && BACKEND_ARCH = ""
-comment "ERROR !!! Backend architecture is NOT set !"
-config BACKEND_ERROR
-    default y
-endif
-
 config BACKEND_KERNEL
     string
     option env="CT_BACKEND_KERNEL"
-
-if BACKEND && BACKEND_KERNEL = ""
-comment "ERROR !!! Backend kernel is NOT set !"
-config BACKEND_ERROR
-    default y
-endif
diff --git a/config/config.in b/config/config.in
index ab71d1a..f4beffe 100644
--- a/config/config.in
+++ b/config/config.in
@@ -1,5 +1,4 @@
 source "config/backend.in"
-if ! BACKEND_ERROR
 source "config/global.in"
 source "config/target.in"
 source "config/toolchain.in"
@@ -10,4 +9,3 @@ source "config/libc.in"
 source "config/debug.in"
 source "config/companion_libs.in"
 source "config/companion_tools.in"
-endif # ! BACKEND_ERROR
diff --git a/config/config.mk b/config/config.mk
index 21cb779..f56ebde 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -91,7 +91,7 @@ define build_gen_choice_in
 	      echo "    $${dep_val#\# }";                                       \
 	    fi;                                                                 \
 	    if [ "$(5)" = "Y" ]; then                                           \
-	      echo "    depends on BACKEND_$(3) = \"$${_entry}\" || ! BACKEND"; \
+	      echo "    depends on $(3)_$${_entry}_AVAILABLE";                  \
 	    fi;                                                                 \
 	    echo "";                                                            \
 	  done;                                                                 \
@@ -100,6 +100,12 @@ define build_gen_choice_in
 	    file="$(4)/$${entry}.in";                                           \
 	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
 	    echo "";                                                            \
+	    if [ "$(5)" = "Y" ]; then                                                                           \
+	      echo "config $(3)_$${_entry}_AVAILABLE";                                                          \
+	      echo "    bool";                                                                                  \
+	      echo "    default n if ! ( BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND )";   \
+	      echo "    default y if BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND";         \
+	    fi;                                                                                                 \
 	    echo "if $(3)_$${_entry}";                                          \
 	    echo "config $(3)";                                                 \
 	    echo "    default \"$${entry}\" if $(3)_$${_entry}";                \
-- 
cgit v0.10.2-6-g49f6