src/hotspot/.mx.jvmci/mx_jvmci.py

*** 43,53 ****
  JVMCI_VERSION = 9
  
  """
  Top level directory of the JDK source workspace.
  """
! _jdkSourceRoot = dirname(_suite.dir)
  
  _JVMCI_JDK_TAG = 'jvmci'
  
  _minVersion = mx.VersionSpec('1.9')
  
--- 43,53 ----
  JVMCI_VERSION = 9
  
  """
  Top level directory of the JDK source workspace.
  """
! _jdkSourceRoot = dirname(dirname(_suite.dir))
  
  _JVMCI_JDK_TAG = 'jvmci'
  
  _minVersion = mx.VersionSpec('1.9')
  
*** 153,167 ****
  To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
  {0}"""
  
      jdkBuildDir = _get_jdk_build_dir()
      if not exists(jdkBuildDir):
!         # JDK9 must be bootstrapped with a JDK8
!         compliance = mx.JavaCompliance('8')
!         jdk8 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
          cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers', '--with-jvm-features=graal',
!                '--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home, '--with-jvm-features=graal']
          mx.run(cmd, cwd=_jdkSourceRoot)
      cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
      if mx.get_opts().verbose:
          cmd.append('LOG=debug')
      cmd.extend(args)
--- 153,167 ----
  To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
  {0}"""
  
      jdkBuildDir = _get_jdk_build_dir()
      if not exists(jdkBuildDir):
!         # JDK10 must be bootstrapped with a JDK9
!         compliance = mx.JavaCompliance('9')
!         jdk9 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
          cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers', '--with-jvm-features=graal',
!                '--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk9.home, '--with-jvm-features=graal']
          mx.run(cmd, cwd=_jdkSourceRoot)
      cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
      if mx.get_opts().verbose:
          cmd.append('LOG=debug')
      cmd.extend(args)