diff options
| author | Dmitry Pankratov <dp@ubiquitech.com> | 2016-10-01 22:43:56 +0200 |
|---|---|---|
| committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-10-01 22:43:56 +0200 |
| commit | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (patch) | |
| tree | 2d8f667a234d6ea577ebb1435f18db60eec3805b /config/libc | |
| parent | 11b20626b0d33624249f2609177f768a39cb70cf (diff) | |
| parent | 531eab4c5650c7d51fa1c527c370b690ac50a8ab (diff) | |
| download | crosstool-ng-34ca68e3b076f4a7eea78aa46215fa50dfb1e322.tar.gz crosstool-ng-34ca68e3b076f4a7eea78aa46215fa50dfb1e322.tar.bz2 crosstool-ng-34ca68e3b076f4a7eea78aa46215fa50dfb1e322.zip | |
Merge branch 'master' of https://github.com/crosstool-ng/crosstool-ng
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/glibc.in.2 | 10 | ||||
| -rw-r--r-- | config/libc/musl.in | 4 | ||||
| -rw-r--r-- | config/libc/none.in | 4 | ||||
| -rw-r--r-- | config/libc/uClibc.in | 4 |
4 files changed, 6 insertions, 16 deletions
diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2 index 346f9b7c..104552a6 100644 --- a/config/libc/glibc.in.2 +++ b/config/libc/glibc.in.2 @@ -55,16 +55,6 @@ config LIBC_GLIBC_EXTRA_CFLAGS help Extra target CFLAGS to use when building. -config LIBC_EXTRA_CC_ARGS - string - prompt "gcc extra flags" - default "" - help - Extra flags to pass gcc when building. - - Seldom used, except for sparc64 which seems to need the flag -64 - to be passed onto gcc. - config LIBC_ENABLE_FORTIFIED_BUILD bool prompt "Enable fortified build (EXPERIMENTAL)" diff --git a/config/libc/musl.in b/config/libc/musl.in index ff84448b..3e0b5a12 100644 --- a/config/libc/musl.in +++ b/config/libc/musl.in @@ -55,7 +55,7 @@ choice config LIBC_MUSL_V_1_1 bool - prompt "1.1.14 (Mainline)" + prompt "1.1.15 (Mainline)" depends on EXPERIMENTAL endchoice @@ -64,6 +64,6 @@ config LIBC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "1.1.14" if LIBC_MUSL_V_1_1 + default "1.1.15" if LIBC_MUSL_V_1_1 endif # ! LIBC_MUSL_CUSTOM diff --git a/config/libc/none.in b/config/libc/none.in index d587faff..b8860b07 100644 --- a/config/libc/none.in +++ b/config/libc/none.in @@ -4,10 +4,10 @@ ## ## help Do not use a C library. ## help -## help This is usefull if your project is self-contained, does not rely on +## help This is useful if your project is self-contained, does not rely on ## help an external C library, and provides all the necessary bits. ## help -## help Most probably usefull to bootloaders, as they generally don't depend +## help Most probably useful to bootloaders, as they generally don't depend ## help on the C library. ## help ## help If unsure: do *not* choose that, and use another option in the choice. diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 989da7ba..a99ff736 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -129,13 +129,13 @@ config LIBC_UCLIBC_VERBOSITY_0 config LIBC_UCLIBC_VERBOSITY_1 bool - prompt "Brief build (show defines, ld flags)" + prompt "Very verbose build" help Print simplified command lines. config LIBC_UCLIBC_VERBOSITY_2 bool - prompt "Very verbose build" + prompt "Brief build (show defines, ld flags)" help Print full command lines. |