diff mx/mx_graal.py @ 18414:df8d52aba789

fixed support for IDE_BUILD_TARGET
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Nov 2014 13:10:24 +0100
parents 1e7b53d7489d
children 676f1800077c
line wrap: on
line diff
--- a/mx/mx_graal.py	Wed Nov 19 09:53:16 2014 +0100
+++ b/mx/mx_graal.py	Wed Nov 19 13:10:24 2014 +0100
@@ -779,6 +779,15 @@
 
     builds = [_vmbuild]
 
+    if os.environ.get('BUILDING_FROM_IDE', None) == 'true':
+        build = os.environ.get('IDE_BUILD_TARGET', None)
+        if build is None or len(build) == 0:
+            return
+        if build not in _vmbuildChoices:
+            mx.abort('VM build "' + build + '" specified by IDE_BUILD_TARGET environment variable is unknown (must be one of ' +
+                     str(_vmbuildChoices) + ')')
+        builds = [build]
+
     if vm is None:
         vm = _get_vm()
 
@@ -798,11 +807,6 @@
 
     isWindows = platform.system() == 'Windows' or "CYGWIN" in platform.system()
     for build in builds:
-        if build == 'ide-build-target':
-            build = os.environ.get('IDE_BUILD_TARGET', None)
-            if build is None or len(build) == 0:
-                continue
-
         installJars = vm != 'original' and (isWindows or not opts2.java)
         jdk = _jdk(build, create=True, installJars=installJars)