---

yaml
---
r: 7283
b: refs/heads/master
c: 6860dcc
h: refs/heads/master
i:
  7281: 33349c8
  7279: ab4bcfc
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48debac9440103d171f4c9dacc0488172ecff9e5
+refs/heads/master: 6860dcc958437d8b8aec1134c657311ef617ec9e

trunk/Makefile.in

@@ -280,21 +280,12 @@ define SREQ
 # Destinations of artifacts for the host compiler
 HROOT$(1)_H_$(3) = $(3)/stage$(1)
 HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-# FIXME: Temporary hack for moving win32 libs to the bin directory
-ifeq ($(1),0)
-HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-else
 HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR)
-endif
 
 # Destinations of artifacts for target architectures
 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
-ifeq ($(1),0)
-TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
-else
 TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
-endif
 
 # The name of the core and standard libraries used by rustc
 ifdef CFG_DISABLE_SHAREDSTD

trunk/configure

@@ -416,18 +416,12 @@ do
 
             # host lib dir
             make_dir $h/stage$i/$CFG_LIBDIR
-	    # FIXME: Transitional. remove
-	    make_dir $h/stage$i/lib
 
             # target bin dir
             make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
-	    # FIXME: Transitional. remove
-	    make_dir $h/stage$i/lib/rustc/$t/bin
 
             # target lib dir
             make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
-	    # FIXME: Transitional. remove
-	    make_dir $h/stage$i/lib/rustc/$t/lib
         done
     done
 

trunk/src/snapshots.txt

@@ -1,3 +1,10 @@
+S 2012-01-14 c6f62b6
+  winnt-i386 f5242fd9064c3ae744b2395c9613b61dd3e157b1
+  linux-i386 614cb4931f5ab8c2ccb7a541bbe4ab1880fa0740
+  macos-i386 3a360fc8618a70e919c44628c4f6f67cea90f6b6
+  linux-x86_64 aa6a0bed5f66879b8427b6836c1b2dc4bfb45517
+  macos-x86_64 c6598b2c0ec504b9594bb8fa8bdac31bc0d3286d
+
 S 2012-01-13 da6674b
   winnt-i386 94591d200400ac0db7e6bfa2397edf3e868dc320
   linux-i386 83615901ad69b4f5914e24ef38b797c6980f186f