diff options
| author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-26 05:07:37 -0800 |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-12-08 10:55:16 -0800 |
| commit | 514f1546d7fe83853c2c2020514e61a90cc26f95 (patch) | |
| tree | 8d4392866f5c3571df307aaf907dd9da92b5ad07 /config/cc | |
| parent | 4e2227e8a5537a8553c503e55d2cb2190f2a0d2f (diff) | |
| download | crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.tar.gz crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.tar.bz2 crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.zip | |
config: Update kconfig for new CT_GetCustom
This commit sort of unifies the kconfigs to handle custom files and
directories.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'config/cc')
| -rw-r--r-- | config/cc/gcc.in | 59 |
1 files changed, 40 insertions, 19 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 4cf46289..887b1065 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -13,6 +13,41 @@ ## help gcc supports many languages, a powerful code parser, optimised binary ## help output, and lots of other features. +config CC_GCC_CUSTOM + bool + prompt "Custom gcc" + depends on EXPERIMENTAL + select CC_GCC_latest + help + The choosen gcc version shall be not downloaded. Instead use + a custom location to get the source. + +if CC_GCC_CUSTOM + +config CC_GCC_CUSTOM_LOCATION + string + prompt "Full path to custom gcc source" + help + Enter the path to the directory or tarball of your source for gcc. + + If the path is a tarball, it should extract to: <name>-<version>/ + where the name is this component, gcc, and the version is set + below in the custom version string. + +config CC_GCC_CUSTOM_VERSION + string + prompt "Custom GCC Version" + help + Enter the version number for your custom gcc. + +config CC_GCC_VERSION + string + default CC_GCC_CUSTOM_VERSION + +endif #CC_GCC_CUSTOM + +if ! CC_GCC_CUSTOM + config CC_GCC_SHOW_LINARO bool prompt "Show Linaro versions" @@ -66,25 +101,7 @@ config CC_GCC_V_4_8_5 endchoice -config CC_GCC_CUSTOM - bool - prompt "Custom gcc" - depends on EXPERIMENTAL - help - The choosen compiler version shall be not downloaded. Instead use - a custom location to get the source. - -if CC_GCC_CUSTOM - -config CC_GCC_CUSTOM_LOCATION - string - prompt "Full path to custom gcc source" - default "" - help - Enter the path to the directory (or tarball) of your source for gcc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/gcc - -endif #CC_GCC_CUSTOM +endif # ! CC_GCC_CUSTOM config CC_GCC_4_8 bool @@ -237,6 +254,8 @@ config CC_GCC_HAS_LIBQUADMATH config CC_GCC_HAS_LIBSANITIZER bool +if ! CC_GCC_CUSTOM + config CC_GCC_VERSION string # Don't remove next line @@ -247,6 +266,8 @@ config CC_GCC_VERSION default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8 default "4.8.5" if CC_GCC_V_4_8_5 +endif # ! CC_GCC_CUSTOM + config CC_LANG_JAVA_USE_ECJ bool default y |