# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1353016544 -3600
# Node ID 158e0c9645c55ed23051c10bb437e6a8b7dc2696
# Parent  b8c29dcb846dbebd219a1fbbcfe306bd7cb591e5# Parent  b62581e29024f5442d01ceaa564af01c2dc4552c
Merge.

diff -r b8c29dcb846d -r 158e0c9645c5 mx/commands.py
--- a/mx/commands.py	Thu Nov 15 22:54:44 2012 +0100
+++ b/mx/commands.py	Thu Nov 15 22:55:44 2012 +0100
@@ -541,8 +541,10 @@
                 return
         else:
             cpus = multiprocessing.cpu_count()
+            runCmd = [mx.gmake_cmd()]
             if build == 'debug':
                 build = 'jvmg'
+            runCmd.append(build + buildSuffix) 
             env = os.environ
             env.setdefault('ARCH_DATA_MODEL', '64')
             env.setdefault('LANG', 'C')
@@ -554,8 +556,13 @@
                 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);
+                    env.setdefault('ENFORCE_COMPILER_REV', compilerRev)
+                    env.setdefault('ENFORCE_CC_COMPILER_REV', compilerRev)
+                    if build == 'jvmg':
+                        # I want ALL the symbols when I'm debugging on Solaris
+                        # Some Makefile variable are overloaded by environment variable so we need to explicitely
+                        # pass them down in the command line. This one is an example of that.
+                        runCmd.append('STRIP_POLICY=no_strip')
             # This removes the need to unzip the *.diz files before debugging in gdb
             env.setdefault('ZIP_DEBUGINFO_FILES', '0')
 
@@ -563,7 +570,7 @@
             env.pop('LD_LIBRARY_PATH', None)
             env.pop('CLASSPATH', None)
 
-            mx.run([mx.gmake_cmd(), build + buildSuffix], cwd=join(_graal_home, 'make'), err=filterXusage)
+            mx.run(runCmd, cwd=join(_graal_home, 'make'), err=filterXusage)
 
         jvmCfg = _vmCfgInJdk(jdk)
         found = False
diff -r b8c29dcb846d -r 158e0c9645c5 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Thu Nov 15 22:54:44 2012 +0100
+++ b/mx/sanitycheck.py	Thu Nov 15 22:55:44 2012 +0100
@@ -48,7 +48,8 @@
 
 dacapoScalaSanityWarmup = {
     'actors':     [0, 0, 2,  8, 10],
-    'apparat':    [0, 0, 1,  2,  3],
+# (lstadler) apparat was disabled due to a deadlock which I think is the benchmarks fault.
+#    'apparat':    [0, 0, 1,  2,  3],
     'factorie':   [0, 0, 2,  5,  5],
     'kiama':      [0, 0, 3, 13, 15],
     'scalac':     [0, 0, 5, 15, 20],