Skip to content

Commit fb3e47e

Browse files
brsonyichoi
brson
authored and
yichoi
committed
---
yaml --- r: 46647 b: refs/heads/auto c: 49c3f9f h: refs/heads/master i: 46645: 0871a7e 46643: db2b1d3 46639: de6f57d v: v3
1 parent 64395cf commit fb3e47e

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 5e6c04b9faf76ef1f1b50b5e8688c00148693228
17+
refs/heads/auto: 49c3f9f1666d31c2b45d132809820d44fb82d6bf

‎branches/auto/mk/install.mk

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
4545

4646
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
4747
$$(Q)mkdir -p $$(PTL$(1)$(2))
48-
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME))
48+
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
4949
$$(Q)$$(call INSTALL_LIB, \
50-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB))
50+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
5151
$$(Q)$$(call INSTALL_LIB, \
52-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
52+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
5353
$$(Q)$$(call INSTALL_LIB, \
54-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
54+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB_$(1)))
5555
$$(Q)$$(call INSTALL_LIB, \
56-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
56+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB_$(1)))
5757
$$(Q)$$(call INSTALL_LIB, \
58-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTPKG_GLOB))
58+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTPKG_GLOB_$(1)))
5959
$$(Q)$$(call INSTALL_LIB, \
60-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
60+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB_$(1)))
6161
$$(Q)$$(call INSTALL_LIB, \
62-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
62+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB_$(1)))
6363
$$(Q)$$(call INSTALL_LIB, \
64-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB))
64+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB_$(1)))
6565
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
6666

6767
endef
@@ -93,19 +93,19 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
9393
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
9494
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
9595
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X))
96-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
97-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG))
98-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
99-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
100-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST))
101-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
102-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
103-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
104-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
105-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB))
106-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB))
107-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
108-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
96+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)))
97+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE)))
98+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE))
99+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE)))
100+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE)))
101+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE)))
102+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
103+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
104+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
105+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
106+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE)))
107+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
108+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
109109
$(Q)$(call INSTALL,$(S)/man, \
110110
$(PREFIX_ROOT)/share/man/man1,rustc.1)
111111

@@ -121,22 +121,22 @@ uninstall:
121121
$(Q)rm -f $(PHB)/rusti$(X)
122122
$(Q)rm -f $(PHB)/rust$(X)
123123
$(Q)rm -f $(PHB)/rustdoc$(X)
124-
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
125-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG)
126-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
127-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
128-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
129-
$(Q)rm -f $(PHL)/$(CFG_LIBRUST)
130-
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
124+
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
125+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG_$(CFG_BUILD_TRIPLE))
126+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE))
127+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC_$(CFG_BUILD_TRIPLE))
128+
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI_$(CFG_BUILD_TRIPLE))
129+
$(Q)rm -f $(PHL)/$(CFG_LIBRUST_$(CFG_BUILD_TRIPLE))
130+
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
131131
$(Q)for i in \
132-
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
133-
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
134-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
135-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
136-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB)) \
137-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
138-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
139-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB)) \
132+
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE))) \
133+
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
134+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
135+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
136+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
137+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
138+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
139+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE))) \
140140
; \
141141
do rm -f $$i ; \
142142
done

‎branches/auto/mk/tests.mk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,50 +220,50 @@ define TEST_RUNNER
220220

221221
$(3)/test/coretest.stage$(1)-$(2)$$(X): \
222222
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
223-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
223+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
224224
@$$(call E, compile_and_link: $$@)
225225
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
226226

227227
$(3)/test/stdtest.stage$(1)-$(2)$$(X): \
228228
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
229-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
229+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
230230
@$$(call E, compile_and_link: $$@)
231231
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
232232

233233
$(3)/test/syntaxtest.stage$(1)-$(2)$$(X): \
234234
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
235-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
235+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
236236
@$$(call E, compile_and_link: $$@)
237237
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
238238

239239
$(3)/test/rustctest.stage$(1)-$(2)$$(X): \
240240
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
241-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM) \
242-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
241+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
242+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
243243
@$$(call E, compile_and_link: $$@)
244244
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
245245

246246
$(3)/test/rustpkgtest.stage$(1)-$(2)$$(X): \
247247
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
248-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
248+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
249249
@$$(call E, compile_and_link: $$@)
250250
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
251251

252252
$(3)/test/rustitest.stage$(1)-$(2)$$(X): \
253253
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
254-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
254+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
255255
@$$(call E, compile_and_link: $$@)
256256
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
257257

258258
$(3)/test/rusttest.stage$(1)-$(2)$$(X): \
259259
$$(RUST_LIB) $$(RUST_INPUTS) \
260-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
260+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
261261
@$$(call E, compile_and_link: $$@)
262262
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
263263

264264
$(3)/test/rustdoctest.stage$(1)-$(2)$$(X): \
265265
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
266-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
266+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
267267
@$$(call E, compile_and_link: $$@)
268268
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
269269

0 commit comments

Comments
 (0)