Mercurial > hg > graal-compiler
changeset 4227:1fe200db8c30
Environment variables for HotSpot's make are only set by mx.build if they aren't already defined.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 05 Jan 2012 14:25:58 +0100 |
| parents | e03ff10d4bfc |
| children | e872562f95f8 |
| files | mx/commands.py mxtool/mx.py |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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):