# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1325769958 -3600
# Node ID 1fe200db8c301e802669d3b3dcf642989171c73e
# Parent  e03ff10d4bfcf50c6eb60d4eb850bb8e305fae26
Environment variables for HotSpot's make are only set by mx.build if they aren't already defined.

diff -r e03ff10d4bfc -r 1fe200db8c30 mx/commands.py
--- a/mx/commands.py	Thu Jan 05 13:17:15 2012 +0100
+++ b/mx/commands.py	Thu Jan 05 14:25:58 2012 +0100
@@ -311,7 +311,12 @@
             mx.log('Error building project')
             return 
     else:
-        os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk, INSTALL='y')
+        env = os.environ
+        env.setdefault('ARCH_DATA_MODEL', '64')
+        env.setdefault('LANG', 'C')
+        env.setdefault('HOTSPOT_BUILD_JOBS', '3')
+        env.setdefault('ALT_BOOTDIR', jdk)
+        env.setdefault('INSTALL', 'y')
         mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
     
 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
diff -r e03ff10d4bfc -r 1fe200db8c30 mxtool/mx.py
--- a/mxtool/mx.py	Thu Jan 05 13:17:15 2012 +0100
+++ b/mxtool/mx.py	Thu Jan 05 14:25:58 2012 +0100
@@ -644,11 +644,11 @@
         abort('Required environment variable ' + key + ' must be set')
     return value
 
-def get_env(key):
+def get_env(key, default=None):
     """
     Gets an environment variable.
     """
-    value = os.environ.get(key)
+    value = os.environ.get(key, default)
     return value
 
 def log(msg=None):