Skip to content

Commit 0bce642

Browse files
committed
Make the glibc check more generic, since it caused the build to fail.
1 parent 7fdcde1 commit 0bce642

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

testing/src/main/java/io/grpc/internal/testing/TestUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ public static void installConscryptIfAvailable() {
170170
provider = ConscryptLoader.newProvider();
171171
} catch (Throwable t) {
172172
Throwable root = Throwables.getRootCause(t);
173-
// Conscrypt uses a newer version of glibc than available on RHEL 6
173+
// Conscrypt uses a newer version of glibc than available on older Linux distributions (e.g. RHEL 6/8)
174174
if (root instanceof UnsatisfiedLinkError && root.getMessage() != null
175-
&& root.getMessage().contains("GLIBC_2.14")) {
175+
&& root.getMessage().contains("GLIBC_")) {
176176
conscryptInstallAttempted = true;
177177
return;
178178
}

0 commit comments

Comments
 (0)