Pārlūkot izejas kodu

Make 'make' more resilient

bryan 11 mēneši atpakaļ
vecāks
revīzija
fcf71c9d49
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6 2
      openwrtbuilder

+ 6 - 2
openwrtbuilder

@@ -674,12 +674,16 @@ fromSource() {
     # Make image
     (( DEBUG )) && make_opts+=("V=s")
 
-    execute make "${make_opts[@]}" defconfig download clean
+    execute make "${make_opts[@]}" "-j1" defconfig download clean
 
     make_opts+=("-j$(($(nproc) - 2))")
     #make_opts+=("-j1") # for debugging purposes
 
-    execute make "${make_opts[@]}" world
+    if ! execute make "${make_opts[@]}" world; then
+        echo "Error: make failed, retrying using slow mode"
+        execute make V=s -j1 dirclean
+        execute make V=s -j1 world
+    fi
 
     popd || return 1