--- old/make/bsd/makefiles/compiler1.make	2015-09-16 15:17:13.000000000 -0700
+++ new/make/bsd/makefiles/compiler1.make	2015-09-16 15:17:12.000000000 -0700
@@ -28,4 +28,7 @@
 
 VM_SUBDIR = client
 
+# We don't support the JVMCI in a client VM.
+INCLUDE_JVMCI := false
+
 CFLAGS += -DCOMPILER1