File tree Expand file tree Collapse file tree 3 files changed +15
-7
lines changed Expand file tree Collapse file tree 3 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -280,12 +280,21 @@ define SREQ
280
280
# Destinations of artifacts for the host compiler
281
281
HROOT$(1 ) _H_$(3 ) = $(3 ) /stage$(1 )
282
282
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
283
287
HLIB$(1)_H_$(3) = $$(HROOT$(1 ) _H_$(3 ) ) /$$(CFG_LIBDIR )
288
+ endif
284
289
285
290
# Destinations of artifacts for target architectures
286
291
TROOT$(1 ) _T_$(2 ) _H_$(3 ) = $$(HLIB$(1 ) _H_$(3 ) ) /rustc/$(2 )
287
292
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
288
296
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1 ) _T_$(2 ) _H_$(3 ) ) /$$(CFG_LIBDIR )
297
+ endif
289
298
290
299
# The name of the core and standard libraries used by rustc
291
300
ifdef CFG_DISABLE_SHAREDSTD
Original file line number Diff line number Diff line change 416
416
417
417
# host lib dir
418
418
make_dir $h /stage$i /$CFG_LIBDIR
419
+ # FIXME: Transitional. remove
420
+ make_dir $h /stage$i /lib
419
421
420
422
# target bin dir
421
423
make_dir $h /stage$i /$CFG_LIBDIR /rustc/$t /bin
424
+ # FIXME: Transitional. remove
425
+ make_dir $h /stage$i /lib/rustc/$t /bin
422
426
423
427
# target lib dir
424
428
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
425
431
done
426
432
done
427
433
Original file line number Diff line number Diff line change 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
-
8
1
S 2012-01-12 44352df
9
2
winnt-i386 fcb87845b0c80b1fa8b798d319a1bd4aaeaa91d1
10
3
linux-x86_64 dc84514290cafab43d0e79387931d6c79129b5ac
You can’t perform that action at this time.
0 commit comments