Mercurial > hg > truffle

diff mx/commands.py @ 6702:602ee4d1db61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added setup of ENFORCE_COMPILER_REV and ENFORCE_CC_COMPILER_REV when using sunstudio compilers on Solaris to avoid build complaint from HotSpot makefiles.
author Laurent Daynes <Laurent.Daynes@oracle.com>
date Fri, 09 Nov 2012 19:41:52 +0100
parents 6d1870a7554a
children 0cb1ac637dd0
line wrap: on
line diff
--- a/mx/commands.py	Fri Nov 09 16:28:38 2012 +0100
+++ b/mx/commands.py	Fri Nov 09 19:41:52 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')