]> git.lizzy.rs Git - rust.git/commitdiff
restore the clobber behavior during config
authorDave Huseby <dhuseby@mozilla.com>
Thu, 5 Feb 2015 08:55:46 +0000 (00:55 -0800)
committerDave Huseby <dhuseby@mozilla.com>
Wed, 11 Feb 2015 22:49:09 +0000 (14:49 -0800)
configure

index 03d4fdac496c0ec5c7f2860b7983c44f8cba4d7d..427f727a2f06825ff50680654b764f714d51341b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1117,12 +1117,11 @@ then
     msg "git: submodule status"
     "${CFG_GIT}" submodule status --recursive
 
-    # don't clobber so that our patches won't get removed
-    #msg "git: submodule clobber"
-    #"${CFG_GIT}" submodule foreach --recursive git clean -dxf
-    #need_ok "git failed"
-    #"${CFG_GIT}" submodule foreach --recursive git checkout .
-    #need_ok "git failed"
+    msg "git: submodule clobber"
+    "${CFG_GIT}" submodule foreach --recursive git clean -dxf
+    need_ok "git failed"
+    "${CFG_GIT}" submodule foreach --recursive git checkout .
+    need_ok "git failed"
 
     cd ${CFG_BUILD_DIR}
 fi