# HG changeset patch
# User Laurent Daynes <Laurent.Daynes@oracle.com>
# Date 1352717281 -3600
# Node ID 04ab1ba96ce20306d83466b2d70469d50eb504ef
# Parent  3a93ae3a6c9e1eaaa784bb6b4ec13d3b86f02590# Parent  602ee4d1db6125c7396a9a8a73fed8a7ed8d5c89
Automated merge with https://lafo.ssw.uni-linz.ac.at/hg/graalvm

diff -r 3a93ae3a6c9e -r 04ab1ba96ce2 mx/commands.py
--- a/mx/commands.py	Mon Nov 12 00:08:17 2012 +0100
+++ b/mx/commands.py	Mon Nov 12 11:48:01 2012 +0100
@@ -542,7 +542,13 @@
             env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus))
             env['ALT_BOOTDIR'] = jdk
             env.setdefault('INSTALL', 'y')
-
+            if mx.get_os() == 'solaris' :
+                # If using sparcWorks, setup flags to avoid make complaining about CC version
+                cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0]
+                if cCompilerVersion.startswith('CC: Sun C++') :
+                    compilerRev = cCompilerVersion.split(' ')[3]
+                    env.setdefault('ENFORCE_COMPILER_REV', compilerRev);
+                    env.setdefault('ENFORCE_CC_COMPILER_REV', compilerRev);
             # This removes the need to unzip the *.diz files before debugging in gdb
             env.setdefault('ZIP_DEBUGINFO_FILES', '0')
 
@@ -623,7 +629,6 @@
         args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args
     if '-d64' not in args:
         args = ['-d64'] + args
-    print ['args = '] + args    
     exe = join(jdk, 'bin', mx.exe_suffix('java'))
     dbg = _native_dbg.split() if _native_dbg is not None else []
     return mx.run(dbg + [exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)