---

yaml
---
r: 97878
b: refs/heads/master
c: 2297b08
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1f1838ea3e6795487521d4541bbd877d8e0797b8
+refs/heads/master: 2297b080090740a2773eabc15c473e389e4a4d96
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

trunk/Makefile.in

@@ -33,7 +33,7 @@
 # stageN - this is the system root, corresponding to, e.g. /usr
 #   bin - binaries compiled for the host
 #   lib - libraries used by the host compiler
-#     rustlib - rustc's own place to organize libraries
+#     rustc - rustc's own place to organize libraries
 #       $(target) - target-specific artifacts
 #         bin - binaries for target architectures
 #         lib - libraries for target architectures
@@ -415,7 +415,6 @@ export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
 export CFG_PREFIX
 export CFG_LIBDIR
-export CFG_RUSTLIBDIR
 
 ######################################################################
 # Subprograms
@@ -436,7 +435,7 @@ HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
 HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR)
 
 # Destinations of artifacts for target architectures
-TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(2)
+TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
 TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
 TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
 

trunk/configure

@@ -398,7 +398,6 @@ valopt datadir "${CFG_PREFIX}/share" "install data"
 valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
 valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
 valopt libdir "${CFG_PREFIX}/lib" "install libraries"
-valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
 
 # Validate Options
 step_msg "validating $CFG_SELF args"
@@ -776,16 +775,11 @@ do
             make_dir $h/stage$i/test
 
             # target bin dir
-            make_dir $h/stage$i/$CFG_LIBDIR/$CFG_RUSTLIBDIR/$t/bin
+            make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
 
             # target lib dir
-            make_dir $h/stage$i/$CFG_LIBDIR/$CFG_RUSTLIBDIR/$t/$CFG_LIBDIR
+            make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
         done
-
-        # Fix stage0:
-        make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/bin
-        make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
-
     done
 
     make_dir $h/test/run-pass
@@ -798,12 +792,12 @@ do
     make_dir $h/test/debug-info
     make_dir $h/test/codegen
     make_dir $h/test/doc-tutorial
-    make_dir $h/test/doc-guide-ffi
-    make_dir $h/test/doc-guide-macros
-    make_dir $h/test/doc-guide-borrowed-ptr
-    make_dir $h/test/doc-guide-container
-    make_dir $h/test/doc-guide-tasks
-    make_dir $h/test/doc-guide-conditions
+    make_dir $h/test/doc-tutorial-ffi
+    make_dir $h/test/doc-tutorial-macros
+    make_dir $h/test/doc-tutorial-borrowed-ptr
+    make_dir $h/test/doc-tutorial-container
+    make_dir $h/test/doc-tutorial-tasks
+    make_dir $h/test/doc-tutorial-conditions
     make_dir $h/test/doc-rust
 done
 
@@ -1037,7 +1031,6 @@ putvar CFG_HOST
 putvar CFG_TARGET
 putvar CFG_C_COMPILER
 putvar CFG_LIBDIR
-putvar CFG_RUSTLIBDIR
 putvar CFG_DISABLE_MANAGE_SUBMODULES
 putvar CFG_ANDROID_CROSS_PATH
 putvar CFG_MINGW32_CROSS_PATH