--- old/make/linux/makefiles/compiler1.make 2015-10-08 07:22:54.000000000 -1000 +++ new/make/linux/makefiles/compiler1.make 2015-10-08 07:22:54.000000000 -1000 @@ -28,4 +28,7 @@ VM_SUBDIR = client +# We don't support the JVMCI in a client VM. +INCLUDE_JVMCI := false + CFLAGS += -DCOMPILER1