diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-02-24 20:02:52 -0800 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-02-24 21:14:34 -0800 |
| commit | 13781f3d8dbc966b2edc5d10747a62378d616287 (patch) | |
| tree | 63d50d8823174a0ea7757084a542b462341ab92d | |
| parent | 274c9708f065925d18b630e3d08c71ef7a1f1369 (diff) | |
| download | rust-13781f3d8dbc966b2edc5d10747a62378d616287.tar.gz rust-13781f3d8dbc966b2edc5d10747a62378d616287.zip | |
retool serializer to be built by stage0 rustc
| -rw-r--r-- | mk/clean.mk | 2 | ||||
| -rwxr-xr-x | src/etc/gen-astencode | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mk/clean.mk b/mk/clean.mk index bc8964ab750..80337c1d6e3 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -64,6 +64,7 @@ clean$(1)_H_$(2): $(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X) $(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X) $(Q)rm -f $$(HBIN$(1)_H_$(2))/cargo$(X) + $(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X) $(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB) @@ -87,6 +88,7 @@ clean$(1)_T_$(2)_H_$(3): $(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X) $(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X) $(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/cargo$(X) + $(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X) $(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB) diff --git a/src/etc/gen-astencode b/src/etc/gen-astencode index 9e598fafe2f..d2fd1aff5e5 100755 --- a/src/etc/gen-astencode +++ b/src/etc/gen-astencode @@ -5,11 +5,16 @@ GEN_TYPES="syntax::ast::item syntax::ast::def middle::typeck::method_origin \ middle::freevars::freevar_entry syntax::ast::def_id" # Find serializer tool: -for S in build/*/stage2/bin/serializer; do +for S in build/*/stage1/bin/serializer; do + + if [ ! -x "$S" ]; then + echo "serializer excutable not found; try 'make serializer'" + exit 1 + fi # Find rustc: D=$(dirname "$S") - R="${D}/rustc" + R="${D}/../../stage0/bin/rustc" if [ ! -x "$R" ]; then echo "rustc not found or not executable at path '$R'" exit 1 |