changeset 22727:9860aa60385f

Fix hotspot build task: needsBuild should check ProjectBuildTask.needsBuild fixes force-building of hotspot
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Fri, 06 Nov 2015 12:48:05 +0100
parents c1b2c689fcff
children eb2091fcd682
files mx.jvmci/mx_jvmci.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Fri Nov 06 12:39:06 2015 +0100
+++ b/mx.jvmci/mx_jvmci.py	Fri Nov 06 12:48:05 2015 +0100
@@ -988,6 +988,10 @@
         self._newestOutput = None
 
     def needsBuild(self, newestInput):
+        # Skip super (NativeBuildTask) because it always returns true
+        (superNeeds, superReason) = mx.ProjectBuildTask.needsBuild(self, newestInput)
+        if superNeeds:
+            return (superNeeds, superReason)
         newestOutput = self.newestOutput()
         for d in ['src', 'make', join('jvmci', 'jdk.vm.ci.hotspot', 'src_gen', 'hotspot')]:  # TODO should this be replaced by a dependency to the project?
             for root, dirnames, files in os.walk(join(_suite.dir, d)):