diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-10-12 18:58:28 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-10-12 18:58:28 (GMT) |
| commit | 91575d02c47e384e381a8a9c83e33814d26799b3 (patch) | |
| tree | 280cebcd23a2ea54c9c478652ace7fead592ba44 /config/libc/uClibc.in | |
| parent | 339b83c3939296e54f5366439a19861372bad9b9 (diff) | |
| parent | df5a341e592fe162999ed9be6da3fb67eb885f12 (diff) | |
Merge branch 'master' into static-libgcc-more-fixes
Diffstat (limited to 'config/libc/uClibc.in')
| -rw-r--r-- | config/libc/uClibc.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index a99ff73..da74968 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -60,6 +60,8 @@ config LIBC_UCLIBC_CUSTOM_VERSION prompt "Custom uClibc Version" help Enter the version number for your custom uClibc. + Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues + with static libraries. config LIBC_VERSION string @@ -75,10 +77,17 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config LIBC_UCLIBC_NG_V_1_0_12 +# List 1.0.17 first to make it default. 1.0.18 has issues with static libs. +config LIBC_UCLIBC_NG_V_1_0_17 bool - prompt "1.0.12" - select LIBC_UCLIBC_NG_1_0_12_or_later + prompt "1.0.17" + select LIBC_UCLIBC_NG_1_0_15_or_later + +config LIBC_UCLIBC_NG_V_1_0_18 + bool + prompt "1.0.18" + depends on EXPERIMENTAL + select LIBC_UCLIBC_NG_1_0_15_or_later config LIBC_UCLIBC_V_0_9_33_2 bool @@ -91,12 +100,13 @@ config LIBC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "1.0.12" if LIBC_UCLIBC_NG_V_1_0_12 + default "1.0.18" if LIBC_UCLIBC_NG_V_1_0_18 + default "1.0.17" if LIBC_UCLIBC_NG_V_1_0_17 default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2 endif # ! LIBC_UCLIBC_CUSTOM -config LIBC_UCLIBC_NG_1_0_12_or_later +config LIBC_UCLIBC_NG_1_0_15_or_later bool select LIBC_UCLIBC_NG_1_0_0_or_later |