From 91c2b82b0947eece64df03f9e03d65a27d4ef0bf Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Fri, 25 Mar 2011 14:05:38 -0700 Subject: [PATCH] Revert "Bulk-edit compile commands in emacs chatter to point to assumed build/ dir off src root." This reverts commit 846f2e2ba994268725f38c36fa12f1a09f21615c. --- src/boot/be/abi.ml | 2 +- src/boot/be/asm.ml | 2 +- src/boot/be/elf.ml | 2 +- src/boot/be/il.ml | 2 +- src/boot/be/macho.ml | 2 +- src/boot/be/pe.ml | 2 +- src/boot/be/ra.ml | 2 +- src/boot/be/x86.ml | 2 +- src/boot/driver/glue.ml | 2 +- src/boot/driver/lib.ml | 2 +- src/boot/driver/main.ml | 2 +- src/boot/driver/session.ml | 2 +- src/boot/fe/ast.ml | 2 +- src/boot/fe/cexp.ml | 2 +- src/boot/fe/extfmt.ml | 2 +- src/boot/fe/fuzz.ml | 2 +- src/boot/fe/item.ml | 2 +- src/boot/fe/lexer.mll | 2 +- src/boot/fe/parser.ml | 2 +- src/boot/fe/pexp.ml | 2 +- src/boot/fe/token.ml | 2 +- src/boot/me/alias.ml | 2 +- src/boot/me/dead.ml | 2 +- src/boot/me/dwarf.ml | 2 +- src/boot/me/effect.ml | 2 +- src/boot/me/layer.ml | 2 +- src/boot/me/layout.ml | 2 +- src/boot/me/loop.ml | 2 +- src/boot/me/resolve.ml | 2 +- src/boot/me/simplify.ml | 2 +- src/boot/me/trans.ml | 2 +- src/boot/me/transutil.ml | 2 +- src/boot/me/type.ml | 2 +- src/boot/me/typestate.ml | 2 +- src/boot/me/walk.ml | 2 +- src/boot/util/bits.ml | 2 +- src/boot/util/common.ml | 2 +- src/boot/util/fmt.ml | 2 +- src/comp/back/abi.rs | 2 +- src/comp/back/x86.rs | 2 +- src/comp/driver/rustc.rs | 2 +- src/comp/driver/session.rs | 2 +- src/comp/front/ast.rs | 2 +- src/comp/front/creader.rs | 2 +- src/comp/front/eval.rs | 2 +- src/comp/front/extfmt.rs | 2 +- src/comp/front/lexer.rs | 2 +- src/comp/front/parser.rs | 2 +- src/comp/front/token.rs | 2 +- src/comp/lib/llvm.rs | 2 +- src/comp/middle/fold.rs | 2 +- src/comp/middle/resolve.rs | 2 +- src/comp/middle/trans.rs | 2 +- src/comp/middle/ty.rs | 2 +- src/comp/middle/typeck.rs | 2 +- src/comp/util/common.rs | 2 +- src/rt/util/synchronized_indexed_list.h | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml index 0d061daeffc9..023e1e1df203 100644 --- a/src/boot/be/abi.ml +++ b/src/boot/be/abi.ml @@ -247,6 +247,6 @@ let load_fixup_codeptr * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/asm.ml b/src/boot/be/asm.ml index 55e9115271dc..939b297cfe92 100644 --- a/src/boot/be/asm.ml +++ b/src/boot/be/asm.ml @@ -826,6 +826,6 @@ let read_rust_note (ar:asm_reader) : (Ast.ident * string) array = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/elf.ml b/src/boot/be/elf.ml index cc44e457e80a..99b680427d36 100644 --- a/src/boot/be/elf.ml +++ b/src/boot/be/elf.ml @@ -1779,6 +1779,6 @@ let get_sections * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/il.ml b/src/boot/be/il.ml index a84fe6e75a04..9a63576e414a 100644 --- a/src/boot/be/il.ml +++ b/src/boot/be/il.ml @@ -932,6 +932,6 @@ let ptr_cast (cell:cell) (rty:referent_ty) : cell = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/macho.ml b/src/boot/be/macho.ml index 1e0734cc7699..5d02b2c22fac 100644 --- a/src/boot/be/macho.ml +++ b/src/boot/be/macho.ml @@ -1189,6 +1189,6 @@ let get_sections * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/pe.ml b/src/boot/be/pe.ml index 50887a4d4d20..b85cb1a95d67 100644 --- a/src/boot/be/pe.ml +++ b/src/boot/be/pe.ml @@ -1170,6 +1170,6 @@ let get_sections * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/ra.ml b/src/boot/be/ra.ml index 72027f21f842..66da80939231 100644 --- a/src/boot/be/ra.ml +++ b/src/boot/be/ra.ml @@ -683,6 +683,6 @@ let reg_alloc * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/be/x86.ml b/src/boot/be/x86.ml index 0a6d7e4452ab..49b660be5aef 100644 --- a/src/boot/be/x86.ml +++ b/src/boot/be/x86.ml @@ -2577,6 +2577,6 @@ let frags_of_emitted_quads (sess:Session.sess) (e:Il.emitter) : Asm.frag = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/driver/glue.ml b/src/boot/driver/glue.ml index c3f5427b034a..4fc7448054df 100644 --- a/src/boot/driver/glue.ml +++ b/src/boot/driver/glue.ml @@ -10,7 +10,7 @@ let alt_pipeline _ _ _ = ();; * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/driver/lib.ml b/src/boot/driver/lib.ml index b430fd583d57..00b1b8341f51 100644 --- a/src/boot/driver/lib.ml +++ b/src/boot/driver/lib.ml @@ -459,6 +459,6 @@ let infer_lib_name * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/driver/main.ml b/src/boot/driver/main.ml index 230d647a02d8..ddcbc9afd707 100644 --- a/src/boot/driver/main.ml +++ b/src/boot/driver/main.ml @@ -529,6 +529,6 @@ then Gc.print_stat stdout;; * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/driver/session.ml b/src/boot/driver/session.ml index 418e25de4185..0b02096f2ced 100644 --- a/src/boot/driver/session.ml +++ b/src/boot/driver/session.ml @@ -145,6 +145,6 @@ let make_crate_id (sess:sess) : crate_id = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/ast.ml b/src/boot/fe/ast.ml index af73c6d08409..5e814af3af58 100644 --- a/src/boot/fe/ast.ml +++ b/src/boot/fe/ast.ml @@ -1826,6 +1826,6 @@ let sprintf_stmt = sprintf_fmt fmt_stmt_body;; * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml index 8910b77b0eeb..0f216fc29937 100644 --- a/src/boot/fe/cexp.ml +++ b/src/boot/fe/cexp.ml @@ -766,6 +766,6 @@ let parse_src_file * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/extfmt.ml b/src/boot/fe/extfmt.ml index 2083a03fd319..8b0b149abc34 100644 --- a/src/boot/fe/extfmt.ml +++ b/src/boot/fe/extfmt.ml @@ -224,6 +224,6 @@ let parse_fmt_string (s:string) : piece array = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/fuzz.ml b/src/boot/fe/fuzz.ml index 01ce04d4917f..2c465be4f3bd 100644 --- a/src/boot/fe/fuzz.ml +++ b/src/boot/fe/fuzz.ml @@ -161,6 +161,6 @@ let fuzz (seed:int option) (sess:Session.sess) : unit = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml index ccf2a3d42161..6cee87963e7f 100644 --- a/src/boot/fe/item.ml +++ b/src/boot/fe/item.ml @@ -1332,6 +1332,6 @@ and parse_mod_items * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/lexer.mll b/src/boot/fe/lexer.mll index badfcad8bc39..b84e5906bb9e 100644 --- a/src/boot/fe/lexer.mll +++ b/src/boot/fe/lexer.mll @@ -474,6 +474,6 @@ and comment depth = parse * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/parser.ml b/src/boot/fe/parser.ml index a81bd4398495..3cf464ca7a8c 100644 --- a/src/boot/fe/parser.ml +++ b/src/boot/fe/parser.ml @@ -367,6 +367,6 @@ let bracketed (bra:token) (ket:token) (prule:pstate -> 'a) (ps:pstate) : 'a = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/pexp.ml b/src/boot/fe/pexp.ml index 0e3d9df20b88..c4dcfe1ddaa6 100644 --- a/src/boot/fe/pexp.ml +++ b/src/boot/fe/pexp.ml @@ -1448,6 +1448,6 @@ and atom_lval (_:pstate) (at:Ast.atom) : Ast.lval = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/fe/token.ml b/src/boot/fe/token.ml index c2278606dd90..7467d4e6eea4 100644 --- a/src/boot/fe/token.ml +++ b/src/boot/fe/token.ml @@ -333,6 +333,6 @@ let rec string_of_tok t = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/alias.ml b/src/boot/me/alias.ml index 015d29071e70..77bc769ee53c 100644 --- a/src/boot/me/alias.ml +++ b/src/boot/me/alias.ml @@ -151,6 +151,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/dead.ml b/src/boot/me/dead.ml index 0395d03db296..376effedad25 100644 --- a/src/boot/me/dead.ml +++ b/src/boot/me/dead.ml @@ -129,6 +129,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/dwarf.ml b/src/boot/me/dwarf.ml index 04fafe1e5a12..5b7c0ca1da15 100644 --- a/src/boot/me/dwarf.ml +++ b/src/boot/me/dwarf.ml @@ -3246,7 +3246,7 @@ let rec extract_mod_items * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/effect.ml b/src/boot/me/effect.ml index e4510a21108a..fc4d03b17d3e 100644 --- a/src/boot/me/effect.ml +++ b/src/boot/me/effect.ml @@ -310,6 +310,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/layer.ml b/src/boot/me/layer.ml index 07f954890aba..a5a33b0ba361 100644 --- a/src/boot/me/layer.ml +++ b/src/boot/me/layer.ml @@ -103,6 +103,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/layout.ml b/src/boot/me/layout.ml index edb35ea36431..977066c016be 100644 --- a/src/boot/me/layout.ml +++ b/src/boot/me/layout.ml @@ -475,6 +475,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/loop.ml b/src/boot/me/loop.ml index 2327b0842dd4..478ae6f9349a 100644 --- a/src/boot/me/loop.ml +++ b/src/boot/me/loop.ml @@ -159,6 +159,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/resolve.ml b/src/boot/me/resolve.ml index 1700bd19aa32..68353fc9e968 100644 --- a/src/boot/me/resolve.ml +++ b/src/boot/me/resolve.ml @@ -929,7 +929,7 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/simplify.ml b/src/boot/me/simplify.ml index 79f5011fd039..97af539ffb70 100644 --- a/src/boot/me/simplify.ml +++ b/src/boot/me/simplify.ml @@ -103,7 +103,7 @@ let process_crate (cx:Semant.ctxt) (crate:Ast.crate) : unit = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml index 42dba9776a08..17dbe3ea263b 100644 --- a/src/boot/me/trans.ml +++ b/src/boot/me/trans.ml @@ -6337,6 +6337,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/transutil.ml b/src/boot/me/transutil.ml index 3c8aab8bf936..3c859e0fdaa2 100644 --- a/src/boot/me/transutil.ml +++ b/src/boot/me/transutil.ml @@ -246,6 +246,6 @@ let iter_rec_parts * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml index 16271c616905..72bdd4044939 100644 --- a/src/boot/me/type.ml +++ b/src/boot/me/type.ml @@ -1447,7 +1447,7 @@ let process_crate (cx:Semant.ctxt) (crate:Ast.crate) : unit = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/typestate.ml b/src/boot/me/typestate.ml index fb2ec7a97c6c..8b7840a2837d 100644 --- a/src/boot/me/typestate.ml +++ b/src/boot/me/typestate.ml @@ -1537,6 +1537,6 @@ let process_crate * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/me/walk.ml b/src/boot/me/walk.ml index b9125e216f21..d3fdc9b483b8 100644 --- a/src/boot/me/walk.ml +++ b/src/boot/me/walk.ml @@ -724,6 +724,6 @@ and walk_block * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/util/bits.ml b/src/boot/util/bits.ml index ec4032d835d3..27bb49021af5 100644 --- a/src/boot/util/bits.ml +++ b/src/boot/util/bits.ml @@ -111,6 +111,6 @@ let to_list (v:t) : int list = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/util/common.ml b/src/boot/util/common.ml index 0af6b0b2e201..c76da0de552b 100644 --- a/src/boot/util/common.ml +++ b/src/boot/util/common.ml @@ -818,6 +818,6 @@ let force_sz (a:size) : int64 = * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/boot/util/fmt.ml b/src/boot/util/fmt.ml index bf5b18ba64dc..8fa4169574f2 100644 --- a/src/boot/util/fmt.ml +++ b/src/boot/util/fmt.ml @@ -81,6 +81,6 @@ let sprintf_fmt * fill-column: 78; * indent-tabs-mode: nil * buffer-file-coding-system: utf-8-unix - * compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; + * compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; * End: *) diff --git a/src/comp/back/abi.rs b/src/comp/back/abi.rs index 171858848931..cae1dc90e8b8 100644 --- a/src/comp/back/abi.rs +++ b/src/comp/back/abi.rs @@ -105,6 +105,6 @@ fn no_op_type_glue_name() -> str { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/back/x86.rs b/src/comp/back/x86.rs index 6719f29ec219..1ac03d1f4ee1 100644 --- a/src/comp/back/x86.rs +++ b/src/comp/back/x86.rs @@ -319,6 +319,6 @@ fn get_target_triple() -> str { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index a5e549b7d5f2..b91d09141d0f 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -228,5 +228,5 @@ impure fn main(vec[str] args) { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index d1bdbaa81938..f6ad590f17fc 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -89,5 +89,5 @@ obj session(cfg targ, map.hashmap[int, crate_metadata] crates) { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 0081ebba228a..70b3320d780c 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -509,6 +509,6 @@ fn is_call_expr(@expr e) -> bool { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/front/creader.rs b/src/comp/front/creader.rs index 0f3c0d98e54c..4a5f28ff8865 100644 --- a/src/comp/front/creader.rs +++ b/src/comp/front/creader.rs @@ -291,5 +291,5 @@ fn lookup_def(session.session sess, &span sp, int cnum, vec[ast.ident] path) // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index 48795b5ced9c..4cf3765f4d37 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -433,6 +433,6 @@ impure fn eval_crate_directive(parser p, // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/front/extfmt.rs b/src/comp/front/extfmt.rs index c2aa06c00248..0a32a851dacd 100644 --- a/src/comp/front/extfmt.rs +++ b/src/comp/front/extfmt.rs @@ -548,6 +548,6 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs index f37025933b87..6975d9c5d6c4 100644 --- a/src/comp/front/lexer.rs +++ b/src/comp/front/lexer.rs @@ -786,6 +786,6 @@ impure fn next_token(reader rdr) -> token.token { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 98c669c96a49..6a37128b93c9 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -2480,6 +2480,6 @@ impure fn parse_crate_from_crate_file(parser p) -> @ast.crate { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/front/token.rs b/src/comp/front/token.rs index e66e3aaa93e2..72d82010ed72 100644 --- a/src/comp/front/token.rs +++ b/src/comp/front/token.rs @@ -359,5 +359,5 @@ fn to_str(token t) -> str { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs index 9f7650d8bf19..1a643fe667ad 100644 --- a/src/comp/lib/llvm.rs +++ b/src/comp/lib/llvm.rs @@ -1414,6 +1414,6 @@ fn mk_section_iter(ObjectFileRef llof) -> section_iter { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index d8799bbdfe9a..da898f4d01e9 100644 --- a/src/comp/middle/fold.rs +++ b/src/comp/middle/fold.rs @@ -1639,6 +1639,6 @@ fn new_identity_fold[ENV]() -> ast_fold[ENV] { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index b2820c6297dd..2c378c8f3af8 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -685,5 +685,5 @@ fn resolve_crate(session.session sess, @ast.crate crate) -> @ast.crate { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 8761fb7521cf..0acbb7e1461f 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -6550,6 +6550,6 @@ fn trans_crate(session.session sess, @ast.crate crate, str output, // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index ed018d79bbf4..fba9a1fd78ab 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -1675,5 +1675,5 @@ fn substitute_ty_params(vec[ast.ty_param] ty_params, vec[@t] bound, @t ty) // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index 7a44d463d0b1..1130920222e1 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -2587,6 +2587,6 @@ fn check_crate(session.session sess, @ast.crate crate) -> @ast.crate { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs index d29c8ffedaa5..b23d6a1ef147 100644 --- a/src/comp/util/common.rs +++ b/src/comp/util/common.rs @@ -83,6 +83,6 @@ fn istr(int i) -> str { // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: // diff --git a/src/rt/util/synchronized_indexed_list.h b/src/rt/util/synchronized_indexed_list.h index 9c0cd51f132d..52fabe059608 100644 --- a/src/rt/util/synchronized_indexed_list.h +++ b/src/rt/util/synchronized_indexed_list.h @@ -68,7 +68,7 @@ public: // indent-tabs-mode: nil // c-basic-offset: 4 // buffer-file-coding-system: utf-8-unix -// compile-command: "make -k -C ../../../build 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; +// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'"; // End: //