*** old/make/common/Modules.gmk	Mon Jul  9 21:36:35 2018
--- new/make/common/Modules.gmk	Mon Jul  9 21:36:35 2018

*** 203,213 ****
--- 203,220 ----
  ifeq ($(INCLUDE_SA), false)
    MODULES_FILTER += jdk.hotspot.agent
  endif
  
  ################################################################################
! # Filter out Graal specific modules if Graal build is disabled
! # Filter out jvmci specific modules if jvmci is disabled
+ 
+ ifeq ($(INCLUDE_JVMCI), false)
+   MODULES_FILTER += jdk.internal.vm.ci
+ endif
+ 
+ ################################################################################
+ # Filter out Graal specific modules if Graal is disabled
  
  ifeq ($(INCLUDE_GRAAL), false)
    MODULES_FILTER += jdk.internal.vm.compiler
    MODULES_FILTER += jdk.internal.vm.compiler.management
  endif