Skip to content

Commit 6becf51

Browse files
committed
Revert "Register snapshots"
This reverts commit 17d504e.
1 parent d95de0d commit 6becf51

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

Makefile.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,21 @@ define SREQ
280280
# Destinations of artifacts for the host compiler
281281
HROOT$(1)_H_$(3) = $(3)/stage$(1)
282282
HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
283+
# FIXME: Temporary hack for moving win32 libs to the bin directory
284+
ifeq ($(1),0)
285+
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
286+
else
283287
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR)
288+
endif
284289

285290
# Destinations of artifacts for target architectures
286291
TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
287292
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
293+
ifeq ($(1),0)
294+
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
295+
else
288296
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
297+
endif
289298

290299
# The name of the core and standard libraries used by rustc
291300
ifdef CFG_DISABLE_SHAREDSTD

configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,18 @@ do
416416

417417
# host lib dir
418418
make_dir $h/stage$i/$CFG_LIBDIR
419+
# FIXME: Transitional. remove
420+
make_dir $h/stage$i/lib
419421

420422
# target bin dir
421423
make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
424+
# FIXME: Transitional. remove
425+
make_dir $h/stage$i/lib/rustc/$t/bin
422426

423427
# target lib dir
424428
make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
429+
# FIXME: Transitional. remove
430+
make_dir $h/stage$i/lib/rustc/$t/lib
425431
done
426432
done
427433

src/snapshots.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
S 2012-01-12 23e0d16
2-
winnt-i386 3d21b0cddbfd086afaf6632b2458d8457422ff62
3-
linux-i386 bb6b05e0e91ae51d696ebce299a45f89babccdee
4-
macos-i386 9e835b370db42b480eafab4f8365028f1c5a5197
5-
linux-x86_64 e9372901737124fe6b776101f0877cc13c86252f
6-
macos-x86_64 550d9a1b0fb30e5fc296a833682db15088a6c803
7-
81
S 2012-01-12 44352df
92
winnt-i386 fcb87845b0c80b1fa8b798d319a1bd4aaeaa91d1
103
linux-x86_64 dc84514290cafab43d0e79387931d6c79129b5ac

0 commit comments

Comments
 (0)