diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/cc/gcc.in | 5 | ||||
-rw-r--r-- | config/comp_libs/cloog.in | 7 | ||||
-rw-r--r-- | config/comp_libs/isl.in | 2 | ||||
-rw-r--r-- | config/global.in | 48 |
4 files changed, 47 insertions, 15 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 74fbb70..f52a07b 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -34,11 +34,6 @@ config CC_GCC_ENABLE_PLUGINS depends on BINUTILS_PLUGINS depends on ! STATIC_TOOLCHAIN -# Affects the build of musl -config GCC_BUG_61144 - bool - default y if GCC_4_9_or_later && !GCC_4_9_2_or_later - # If binutils installs gold, enable support for gold in gcc config CC_GCC_GOLD def_bool y diff --git a/config/comp_libs/cloog.in b/config/comp_libs/cloog.in index 54cb76b..01318b4 100644 --- a/config/comp_libs/cloog.in +++ b/config/comp_libs/cloog.in @@ -1,8 +1 @@ # CLooG options - -# CLooG 0.18.4 requires ISL 0.12 or newer -# CLooG 0.18.1/0.18.0 requires ISL 0.12 or older - -config CLOOG_HAS_WITH_GMP_ISL_OSL - bool - default y if CLOOG_0_18_or_later diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in index e0358ee..fe6fa8d 100644 --- a/config/comp_libs/isl.in +++ b/config/comp_libs/isl.in @@ -1,4 +1,6 @@ # ISL options +# CLooG 0.18.4 requires ISL 0.12 or newer +# CLooG 0.18.1 requires ISL 0.12 or older ## select CLOOG_REQUIRE_0_18_1_or_older if CLOOG_NEEDED && !ISL_0_12_or_later ## select CLOOG_REQUIRE_0_18_4_or_later if CLOOG_NEEDED && !ISL_0_14_or_older diff --git a/config/global.in b/config/global.in index 0dff199..f5df002 100644 --- a/config/global.in +++ b/config/global.in @@ -1,14 +1,56 @@ # Overall toolchain configuration: paths, jobs, etc... -config CT_VERSION +config VERSION string option env="CT_VERSION" +# Config version checking framework. If CONFIG_VERSION is unset in the current .config +# or defconfig, it is loaded as 0 (possibly triggering a user prompt during 'ct-ng oldconfig'). +# If the value of CONFIG_VERSION is older than CONFIG_VERSION_CURRENT, we'll advice the user +# to run the configuration through an upgrade. If it is newer, we'll error out - I have no +# crystal orb to perform the downgrade. + +# Hack to make kconfig save/load the value for CONFIG_VERSION. Set to empty value (for +# normal operations like 'ct-ng menuconfig'); 'load' for creating a configuration from a (potentially) +# old file, i.e. 'ct-ng <sample>' or 'ct-ng oldconfig'; 'save' for saving the current configuration, +# i.e. 'ct-ng saveconfig' or 'ct-ng savedefconfig'. +config VCHECK + string + option env="CT_VCHECK" + +# Kconfig's idiosynchrasy: it does not output the config settings declared with 'option env' +# to the generated .config file. Must use one extra level of indirection. +config CONFIG_VERSION_ENV + string + option env="CT_CONFIG_VERSION_CURRENT" + +# Up-to-date version of the configuration file. If saving a defconfig, choose a default that +# is guaranteed not to match - so that kconfig saves the value to .config. +config CONFIG_VERSION_CURRENT + string + default CONFIG_VERSION_ENV + +# Version used by the config being loaded (e.g. as part of 'oldconfig' or recalling +# a defconfig. Make it changeable while loading/saving to force writing it to defconfig. +config CONFIG_VERSION + string + prompt "** make it changeable **" if VCHECK = "load" || VCHECK = "save" + default "0" if VCHECK = "load" || VCHECK = "save" + default CONFIG_VERSION_CURRENT + +if VCHECK = "warning" +comment "*************************************************************************" +comment "Loaded configuration was generated by a previous version of crosstool-NG." +comment "Saving it will mark the configuration as up-to-date without verifying it." +comment "It is recommended to run \"ct-ng upgradeconfig\" before making any " +comment "changes to the configuration. " +comment "*************************************************************************" +endif + # Allow unconditional usage of tristates config MODULES - bool + def_bool y option modules - default y menu "Paths and misc options" |