diff options
| author | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 21:03:11 +0100 |
|---|---|---|
| committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 21:03:11 +0100 |
| commit | 0d17d26005efbd5d6157df0f68a26c738c385ed2 (patch) | |
| tree | 9c25ccb481bd4b58e54c692403d9c49402f09d98 /config/libc | |
| parent | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (diff) | |
| parent | 5ebbb52be04e42bbd1c28b903eba642bebaeb1b6 (diff) | |
| download | crosstool-ng-0d17d26005efbd5d6157df0f68a26c738c385ed2.tar.gz crosstool-ng-0d17d26005efbd5d6157df0f68a26c738c385ed2.tar.bz2 crosstool-ng-0d17d26005efbd5d6157df0f68a26c738c385ed2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/uClibc.in | 20 | ||||
| -rw-r--r-- | config/libc/uClibc.in.2 | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index a99ff736..da74968a 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 diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2 index 3a5fe345..dc024201 100644 --- a/config/libc/uClibc.in.2 +++ b/config/libc/uClibc.in.2 @@ -1,6 +1,6 @@ # uClibc second-part option -if THREADS_LT +if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later choice bool @@ -30,10 +30,12 @@ endchoice endif # THREADS_LT +# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads config LIBC_UCLIBC_LNXTHRD string default "" if THREADS_NONE default "" if THREADS_NATIVE + default "" if LIBC_UCLIBC_NG_1_0_15_or_later default "old" if LIBC_UCLIBC_LNXTHRD_OLD default "new" if LIBC_UCLIBC_LNXTHRD_NEW |