about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2017-04-18 18:19:22 -0700
committerKartik K. Agaram <vc@akkartik.com>2017-04-18 18:19:22 -0700
commit46a3b11cdbc20b0c6e63b18a1e1af7b4383217d3 (patch)
tree794be9b86b3d024c12515b8e796b2103bae793d2
parente3a53f3a7d5bc581661fdd249c1a74732493b550 (diff)
downloadmu-46a3b11cdbc20b0c6e63b18a1e1af7b4383217d3.tar.gz
3835
-rwxr-xr-xbuild12
1 files changed, 3 insertions, 9 deletions
diff --git a/build b/build
index 09208271..970464b5 100755
--- a/build
+++ b/build
@@ -92,15 +92,8 @@ older_than tangle/tangle tangle/*.cc && {
 
 LAYERS=$(./enumerate/enumerate --until $UNTIL_LAYER  |grep -v '.mu$')
 older_than mu.cc $LAYERS enumerate/enumerate tangle/tangle && {
-  # exception to the rules above: we combine 'older_than' and 'update' here
-  # because we sometimes want to hack directly on mu.cc and not lose our
-  # changes if they're newer.
-
-  # shorter version but continues unnecessarily if tangle dies
-  #   ./tangle/tangle $LAYERS |update mu.cc
-  ./tangle/tangle $LAYERS  > mu_tmp.cc  # die if this fails
-  cat mu_tmp.cc |update mu.cc
-  rm mu_tmp.cc
+  # no update here; rely on 'update' calls downstream
+  ./tangle/tangle $LAYERS  > mu.cc
 }
 
 older_than cleave/cleave cleave/cleave.cc && {
@@ -150,5 +143,6 @@ exit 0
 #   no output when nothing needs updating
 #     no output for mu.cc when .mu files modified
 #     touch mu.cc but don't modify it; no output on second build
+#     touch a .cc layer but don't modify it; no output on second build
 #   only a single layer is recompiled when changing a C++ function
 #   stop immediately after failure in tangle