diff options
-rw-r--r-- | config/libc/glibc.in | 22 | ||||
-rw-r--r-- | scripts/build/libc/glibc.sh | 14 |
2 files changed, 0 insertions, 36 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 97d21c3..777657c 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -49,21 +49,10 @@ config LIBC_V_2_3_6 prompt "2.3.6 (OBSOLETE)" depends on OBSOLETE -config LIBC_V_LATEST - bool - prompt "'latest' snapshot (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config LIBC_V_date - bool - prompt "<specific date> (EXPERIMENTAL)" - depends on EXPERIMENTAL - endchoice config LIBC_VERSION string - prompt "Enter date (YYYYMMDD)" if LIBC_V_date # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "2.9" if LIBC_V_2_9 @@ -74,7 +63,6 @@ config LIBC_VERSION default "2.5.1" if LIBC_V_2_5_1 default "2.5" if LIBC_V_2_5 default "2.3.6" if LIBC_V_2_3_6 - default "latest" if LIBC_V_LATEST config LIBC_GLIBC_2_8_or_later bool @@ -128,14 +116,4 @@ config LIBC_GLIBC_CVS_date endif # LIBC_GLIBC_CVS -#config LIBC_GLIBC_SNAPSHOT -# bool -# prompt "Use latest nightly snapshot" -# help -# See the help for the entry "Released tarball", above. -# -# If you can live with a moving code-base, say 'Y' here. -# If you want your toolchain to really be reproducible, look at the -# choice entry "Released tarball from FTP", above. - endchoice diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 0f60bd1..44633b1 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -47,8 +47,6 @@ do_libc_get() { "glibc-${version}-branch${date:+:}${date}" \ "glibc-${addon}-cvs-${CT_LIBC_VERSION}" done -# elif [ "${CT_LIBC_GLIBC_SNAPSHOT}" = "y" ]; then -# : # Not yet handled... fi return 0 @@ -294,12 +292,6 @@ do_libc_start_files() { # Add some default CC args glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ -o ${glibc_version_major} -gt 2 ]; then # Don't use -pipe: configure chokes on it for glibc >= 2.6. @@ -409,12 +401,6 @@ do_libc() { # Add some default CC args glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ -o ${glibc_version_major} -gt 2 ]; then # Don't use -pipe: configure chokes on it for glibc >= 2.6. |