mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-20 05:17:54 +00:00
Merge pull request #155 from bhundven/glibc_update
glibc: Add 2.22, and add a constraint on glibc >= 2.21
This commit is contained in:
commit
21818128bc
@ -34,10 +34,15 @@ choice
|
|||||||
# Don't remove next line
|
# Don't remove next line
|
||||||
# CT_INSERT_VERSION_BELOW
|
# CT_INSERT_VERSION_BELOW
|
||||||
|
|
||||||
|
config LIBC_GLIBC_V_2_22
|
||||||
|
bool
|
||||||
|
prompt "2.22"
|
||||||
|
select LIBC_GLIBC_2_21_or_later
|
||||||
|
|
||||||
config LIBC_GLIBC_V_2_21
|
config LIBC_GLIBC_V_2_21
|
||||||
bool
|
bool
|
||||||
prompt "2.21"
|
prompt "2.21"
|
||||||
select LIBC_GLIBC_2_20_or_later
|
select LIBC_GLIBC_2_21_or_later
|
||||||
|
|
||||||
config LIBC_GLIBC_LINARO_V_2_20
|
config LIBC_GLIBC_LINARO_V_2_20
|
||||||
bool
|
bool
|
||||||
@ -132,6 +137,11 @@ config LIBC_GLIBC_CUSTOM
|
|||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
# glibc 2.21 depends on gcc >= 4.6
|
||||||
|
config LIBC_GLIBC_2_21_or_later
|
||||||
|
bool
|
||||||
|
depends on CC_GCC_4_6_or_later
|
||||||
|
|
||||||
config LIBC_GLIBC_2_20_or_later
|
config LIBC_GLIBC_2_20_or_later
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@ -154,6 +164,7 @@ config LIBC_VERSION
|
|||||||
string
|
string
|
||||||
# Don't remove next line
|
# Don't remove next line
|
||||||
# CT_INSERT_VERSION_STRING_BELOW
|
# CT_INSERT_VERSION_STRING_BELOW
|
||||||
|
default "2.22" if LIBC_GLIBC_V_2_22
|
||||||
default "2.21" if LIBC_GLIBC_V_2_21
|
default "2.21" if LIBC_GLIBC_V_2_21
|
||||||
default "linaro-2.20-2014.11" if LIBC_GLIBC_LINARO_V_2_20
|
default "linaro-2.20-2014.11" if LIBC_GLIBC_LINARO_V_2_20
|
||||||
default "2.20" if LIBC_GLIBC_V_2_20
|
default "2.20" if LIBC_GLIBC_V_2_20
|
||||||
|
Loading…
Reference in New Issue
Block a user