Bug 1329306 - Also clobber the CMakeFiles directory; r=mystor
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 05 Jan 2017 01:00:14 -0500
changeset 356438 d6dd74d3c794b9dd56d1890bab199b496b6dbf16
parent 356437 46cb4ee497868904876ee4dd99125e834ccd3f05
child 356439 c05634d71a73b5b5f58d90b6dc0241e373d88d02
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmystor
bugs1329306
milestone53.0a1
Bug 1329306 - Also clobber the CMakeFiles directory; r=mystor This directory can include variables for the toolchain path names, for example, which are different from run to run on Windows TaskCluster workers.
build/build-clang/build-clang.py
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -200,16 +200,18 @@ def build_one_stage(cc, cxx, ld, ar, ran
     build_dir = stage_dir + "/build"
     inst_dir = stage_dir + "/clang"
 
     # If CMake has already been run, it may have been run with different
     # arguments, so we need to re-run it.  Make sure the cached copy of the
     # previous CMake run is cleared before running it again.
     if os.path.exists(build_dir + "/CMakeCache.txt"):
         os.remove(build_dir + "/CMakeCache.txt")
+    if os.path.exists(build_dir + "/CMakeFiles"):
+        shutil.rmtree(build_dir + "/CMakeFiles")
 
     # cmake doesn't deal well with backslashes in paths.
     def slashify_path(path):
         return path.replace('\\', '/')
 
     cmake_args = ["-GNinja",
                   "-DCMAKE_C_COMPILER=%s" % slashify_path(cc[0]),
                   "-DCMAKE_CXX_COMPILER=%s" % slashify_path(cxx[0]),