Merge branch 'feature-LLVM_unified' of github.com:Crivella/easybuild-easyblocks into feature-LLVM_unified

Author: boegel

easybuild/easyblocks/l/llvm.py

@@ -822,31 +822,18 @@ def build_step(self, verbose=False, path=None):
         else:
             self.log.info("Building LLVM")
             print_msg("Building stage 1/1")
-        # change_dir(self.llvm_obj_dir_stage1)
-        # super(EB_LLVM, self).build_step(verbose, path)
-        import shutil
-        change_dir(self.builddir)
-        print_msg("TESTING!!!: Copying from previosu build (REMOVE ME)")
-        shutil.rmtree('llvm.obj.1', ignore_errors=True)
-        shutil.copytree(os.path.join('..', 'llvm.obj.1'), 'llvm.obj.1')
+        change_dir(self.llvm_obj_dir_stage1)
+        super(EB_LLVM, self).build_step(verbose, path)
         if self.cfg['bootstrap']:
             self.log.info("Building stage 2")
             print_msg("Building stage 2/3")
-            # self.configure_step2()
-            # self.build_with_prev_stage(self.llvm_obj_dir_stage1, self.llvm_obj_dir_stage2)
-            change_dir(self.builddir)
-            print_msg("TESTING!!!: Copying from previosu build (REMOVE ME)")
-            shutil.rmtree('llvm.obj.2', ignore_errors=True)
-            shutil.copytree(os.path.join('..', 'llvm.obj.2'), 'llvm.obj.2')
+            self.configure_step2()
+            self.build_with_prev_stage(self.llvm_obj_dir_stage1, self.llvm_obj_dir_stage2)
 
             self.log.info("Building stage 3")
             print_msg("Building stage 3/3")
             self.configure_step3()
             self.build_with_prev_stage(self.llvm_obj_dir_stage2, self.llvm_obj_dir_stage3)
-            # change_dir(self.builddir)
-            # print_msg("TESTING!!!: Copying from previosu build (REMOVE ME)")
-            # shutil.rmtree('llvm.obj.3', ignore_errors=True)
-            # shutil.copytree(os.path.join('..', 'llvm.obj.3'), 'llvm.obj.3')
 
     def _para_test_step(self, parallel=1):
         """Run test suite with the specified number of parallel jobs for make."""