diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/glibc/Config.in | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/glibc/Config.in')
| -rw-r--r-- | package/glibc/Config.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 693a33ee59..d1ad3de47a 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -4,17 +4,19 @@ choice prompt "glibc version" default BR2_GLIBC_VERSION_2_18 # Architectures supported in mainline glibc - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_sh || BR2_sh64 || BR2_sparc || \ - BR2_x86_64 || BR2_microblaze + depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ + BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_sh64 || BR2_sparc || BR2_x86_64 || \\ + BR2_microblaze config BR2_GLIBC_VERSION_2_18 - bool "2.18" + bool "2.18" + depends on !BR2_powerpc64le config BR2_GLIBC_VERSION_2_19 - bool "2.19" + bool "2.19" endchoice |
