Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: chrome/browser/obsolete_system/obsolete_system_linux.cc

Issue 1634753005: Linux: Relax the deprecation glibc version check slightly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rephrase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/obsolete_system/obsolete_system_linux.cc
diff --git a/chrome/browser/obsolete_system/obsolete_system_linux.cc b/chrome/browser/obsolete_system/obsolete_system_linux.cc
index 5da79989ead5acfb0367e68e2daa03074ec4e285..48863f30480ba70eee9deea37200800eb94fb748 100644
--- a/chrome/browser/obsolete_system/obsolete_system_linux.cc
+++ b/chrome/browser/obsolete_system/obsolete_system_linux.cc
@@ -25,7 +25,10 @@ bool ObsoleteSystem::IsObsoleteNowOrSoon() {
return true;
#else
// Ubuntu 14.04 will be used as the next build platform, and it ships with
- // glibc 2.19, so check for that as the minimum requirement.
+ // glibc 2.19. However, as of this writing, the binary produced on Ubuntu
+ // 14.04 does not actually require glibc 2.19. Thus this function checks for
+ // glibc 2.17 as the minimum requirement, so Ubuntu 12.04 (glibc 2.15) will
+ // be considered obsolete, but RHEL 7 (glibc 2.17) will not.
Version version(gnu_get_libc_version());
if (!version.IsValid() || version.components().size() != 2)
return false;
@@ -35,7 +38,7 @@ bool ObsoleteSystem::IsObsoleteNowOrSoon() {
if (glibc_major_version < 2)
return true;
- return glibc_major_version == 2 && glibc_minor_version < 19;
+ return glibc_major_version == 2 && glibc_minor_version < 17;
#endif // defined(ARCH_CPU_32_BITS)
#else
return false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698