diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-01-12 20:06:30 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-12 20:06:30 -0800 |
| commit | 6becf517e3faa611930470bd48d447940e040da6 (patch) | |
| tree | 1c4c6445cd7f35527de610660b8f7f9f4de12ec7 | |
| parent | d95de0dd955312d840c7e4f20a5dd9d791355e3e (diff) | |
| download | rust-6becf517e3faa611930470bd48d447940e040da6.tar.gz rust-6becf517e3faa611930470bd48d447940e040da6.zip | |
Revert "Register snapshots"
This reverts commit 17d504e0a9bce9d341a85ebbf080b769887cb5c9.
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | src/snapshots.txt | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 457af635b0a..2b0d23cfe31 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,12 +280,21 @@ 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 diff --git a/configure b/configure index 603cfbd7faf..fb6bbf06219 100755 --- a/configure +++ b/configure @@ -416,12 +416,18 @@ 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 diff --git a/src/snapshots.txt b/src/snapshots.txt index 2849fec43be..add74ee17b4 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,10 +1,3 @@ -S 2012-01-12 23e0d16 - winnt-i386 3d21b0cddbfd086afaf6632b2458d8457422ff62 - linux-i386 bb6b05e0e91ae51d696ebce299a45f89babccdee - macos-i386 9e835b370db42b480eafab4f8365028f1c5a5197 - linux-x86_64 e9372901737124fe6b776101f0877cc13c86252f - macos-x86_64 550d9a1b0fb30e5fc296a833682db15088a6c803 - S 2012-01-12 44352df winnt-i386 fcb87845b0c80b1fa8b798d319a1bd4aaeaa91d1 linux-x86_64 dc84514290cafab43d0e79387931d6c79129b5ac |