--- old/make/lib/CoreLibraries.gmk	2017-04-26 15:41:44.617425930 -0700
+++ new/make/lib/CoreLibraries.gmk	2017-04-26 15:41:44.437422670 -0700
@@ -339,7 +339,7 @@
 endif
 
 
-LIBJLI_CFLAGS += -DCLIB=\"$(OPENJDK_TARGET_CLIB)\"
+LIBJLI_CFLAGS += -DLIBC=\"$(OPENJDK_TARGET_LIBC)\"
 
 LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS))
 
--- old/src/java.base/unix/native/libjli/java_md_solinux.c	2017-04-26 15:41:45.509442086 -0700
+++ new/src/java.base/unix/native/libjli/java_md_solinux.c	2017-04-26 15:41:45.317438609 -0700
@@ -242,11 +242,11 @@
     char *p; /* a utility pointer */
 
 #ifdef __linux
-#ifndef CLIB
-#error "CLIB not set"
+#ifndef LIBC
+#error "LIBC not set"
 #endif
 
-    if (strcmp(CLIB, "musl") == 0) {
+    if (strcmp(LIBC, "musl") == 0) {
       /*
        * The musl library loader requires LD_LIBRARY_PATH to be set in
        * order to correctly resolve the dependency libjava.so has on libjvm.so.