# HG changeset patch # User Gilles Duboscq # Date 1443718085 -7200 # Node ID 3af40fab60c28fde848012e7958e09fe7b2783e2 # Parent c33f0cb02b34763c55dafa5589dca932e91d3b71 Use make clean to clean hotspot build diff -r c33f0cb02b34 -r 3af40fab60c2 mx.jvmci/mx_jvmci.py --- a/mx.jvmci/mx_jvmci.py Thu Oct 01 16:31:04 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Thu Oct 01 18:48:05 2015 +0200 @@ -1021,9 +1021,16 @@ shutil.rmtree(name, ignore_errors=False, onerror=handleRemoveReadonly) elif os.path.isfile(name): os.unlink(name) - - rmIfExists(join(_suite.dir, 'build')) - rmIfExists(join(_suite.dir, 'build-nojvmci')) + nojvmci_outputdir = join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os())) + makeFiles = join(_suite.dir, 'make') + if mx._opts.verbose: + outCapture = None + else: + def _consume(s): + pass + outCapture = _consume + mx.run([mx.gmake_cmd(), 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'clean'], out=outCapture, cwd=makeFiles) + mx.run([mx.gmake_cmd(), 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'ALT_OUTPUTDIR=' + nojvmci_outputdir, 'clean'], out=outCapture, cwd=makeFiles) rmIfExists(_jdksDir()) self._newestOutput = None