config: do not force setting kernel and arch
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Apr 01 19:45:28 2010 +0200 (2010-04-01)
changeset 1877b579a5cb53d1
parent 1876 a6a4beab3125
child 1878 2c577664a23d
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.
config/backend.in
config/config.in
config/config.mk
     1.1 --- a/config/backend.in	Fri Apr 02 00:18:26 2010 +0200
     1.2 +++ b/config/backend.in	Thu Apr 01 19:45:28 2010 +0200
     1.3 @@ -9,25 +9,10 @@
     1.4      default y if IS_A_BACKEND =  "y" || IS_A_BACKEND =  "Y"
     1.5      default n if IS_A_BACKEND != "y" && IS_A_BACKEND != "Y"
     1.6  
     1.7 -config BACKEND_ERROR
     1.8 -    bool
     1.9 -
    1.10  config BACKEND_ARCH
    1.11      string
    1.12      option env="CT_BACKEND_ARCH"
    1.13  
    1.14 -if BACKEND && BACKEND_ARCH = ""
    1.15 -comment "ERROR !!! Backend architecture is NOT set !"
    1.16 -config BACKEND_ERROR
    1.17 -    default y
    1.18 -endif
    1.19 -
    1.20  config BACKEND_KERNEL
    1.21      string
    1.22      option env="CT_BACKEND_KERNEL"
    1.23 -
    1.24 -if BACKEND && BACKEND_KERNEL = ""
    1.25 -comment "ERROR !!! Backend kernel is NOT set !"
    1.26 -config BACKEND_ERROR
    1.27 -    default y
    1.28 -endif
     2.1 --- a/config/config.in	Fri Apr 02 00:18:26 2010 +0200
     2.2 +++ b/config/config.in	Thu Apr 01 19:45:28 2010 +0200
     2.3 @@ -1,5 +1,4 @@
     2.4  source "config/backend.in"
     2.5 -if ! BACKEND_ERROR
     2.6  source "config/global.in"
     2.7  source "config/target.in"
     2.8  source "config/toolchain.in"
     2.9 @@ -10,4 +9,3 @@
    2.10  source "config/debug.in"
    2.11  source "config/companion_libs.in"
    2.12  source "config/companion_tools.in"
    2.13 -endif # ! BACKEND_ERROR
     3.1 --- a/config/config.mk	Fri Apr 02 00:18:26 2010 +0200
     3.2 +++ b/config/config.mk	Thu Apr 01 19:45:28 2010 +0200
     3.3 @@ -91,7 +91,7 @@
     3.4  	      echo "    $${dep_val#\# }";                                       \
     3.5  	    fi;                                                                 \
     3.6  	    if [ "$(5)" = "Y" ]; then                                           \
     3.7 -	      echo "    depends on BACKEND_$(3) = \"$${_entry}\" || ! BACKEND"; \
     3.8 +	      echo "    depends on $(3)_$${_entry}_AVAILABLE";                  \
     3.9  	    fi;                                                                 \
    3.10  	    echo "";                                                            \
    3.11  	  done;                                                                 \
    3.12 @@ -100,6 +100,12 @@
    3.13  	    file="$(4)/$${entry}.in";                                           \
    3.14  	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
    3.15  	    echo "";                                                            \
    3.16 +	    if [ "$(5)" = "Y" ]; then                                                                           \
    3.17 +	      echo "config $(3)_$${_entry}_AVAILABLE";                                                          \
    3.18 +	      echo "    bool";                                                                                  \
    3.19 +	      echo "    default n if ! ( BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND )";   \
    3.20 +	      echo "    default y if BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND";         \
    3.21 +	    fi;                                                                                                 \
    3.22  	    echo "if $(3)_$${_entry}";                                          \
    3.23  	    echo "config $(3)";                                                 \
    3.24  	    echo "    default \"$${entry}\" if $(3)_$${_entry}";                \