Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
6701:6d1870a7554a 6702:602ee4d1db61
540 env.setdefault('ARCH_DATA_MODEL', '64') 540 env.setdefault('ARCH_DATA_MODEL', '64')
541 env.setdefault('LANG', 'C') 541 env.setdefault('LANG', 'C')
542 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus)) 542 env.setdefault('HOTSPOT_BUILD_JOBS', str(cpus))
543 env['ALT_BOOTDIR'] = jdk 543 env['ALT_BOOTDIR'] = jdk
544 env.setdefault('INSTALL', 'y') 544 env.setdefault('INSTALL', 'y')
545 545 if mx.get_os() == 'solaris' :
546 # If using sparcWorks, setup flags to avoid make complaining about CC version
547 cCompilerVersion = subprocess.Popen('CC -V', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).stderr.readlines()[0]
548 if cCompilerVersion.startswith('CC: Sun C++') :
549 compilerRev = cCompilerVersion.split(' ')[3]
550 env.setdefault('ENFORCE_COMPILER_REV', compilerRev);
551 env.setdefault('ENFORCE_CC_COMPILER_REV', compilerRev);
546 # This removes the need to unzip the *.diz files before debugging in gdb 552 # This removes the need to unzip the *.diz files before debugging in gdb
547 env.setdefault('ZIP_DEBUGINFO_FILES', '0') 553 env.setdefault('ZIP_DEBUGINFO_FILES', '0')
548 554
549 # Clear these 2 variables as having them set can cause very confusing build problems 555 # Clear these 2 variables as having them set can cause very confusing build problems
550 env.pop('LD_LIBRARY_PATH', None) 556 env.pop('LD_LIBRARY_PATH', None)