Skip to content

Commit 4252a24

Browse files
borsbors
committed
auto merge of #10528 : alexcrichton/rust/static-linking-v2, r=pcwalton
In this series of commits, I've implemented static linking for rust. The scheme I implemented was the same as my [mailing list post](https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html). The commits have more details to the nitty gritty of what went on. I've rebased this on top of my native mutex pull request (#10479), but I imagine that it will land before this lands, I just wanted to pre-emptively get all the rebase conflicts out of the way (becuase this is reorganizing building librustrt as well). Some contentious points I want to make sure are all good: * I've added more "compiler chooses a default" behavior than I would like, I want to make sure that this is all very clearly outlined in the code, and if not I would like to remove behavior or make it clearer. * I want to make sure that the new "fancy suite" tests are ok (using make/python instead of another rust crate) If we do indeed pursue this, I would be more than willing to write up a document describing how linking in rust works. I believe that this behavior should be very understandable, and the compiler should never hinder someone just because linking is a little fuzzy.
2 parents dfe46f7 + 56e4c82 commit 4252a24

File tree

137 files changed

+1714
-799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1714
-799
lines changed

‎Makefile.in‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ ifndef DEBUG_BORROWS
130130
RUSTFLAGS_STAGE2 += -Z no-debug-borrows
131131
endif
132132

133+
# The executables crated during this compilation process have no need to include
134+
# static copies of libstd and libextra. We also generate dynamic versions of all
135+
# libraries, so in the interest of space, prefer dynamic linking throughout the
136+
# compilation process.
137+
RUSTFLAGS_STAGE1 += -Z prefer-dynamic
138+
RUSTFLAGS_STAGE2 += -Z prefer-dynamic
139+
RUSTFLAGS_STAGE3 += -Z prefer-dynamic
140+
133141
# platform-specific auto-configuration
134142
include $(CFG_SRC_DIR)mk/platform.mk
135143

@@ -214,7 +222,7 @@ GENERATED :=
214222

215223
define DEF_LIBS
216224

217-
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
225+
CFG_RUNTIME_$(1) :=$(call CFG_STATIC_LIB_NAME_$(1),rustrt)
218226
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
219227
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
220228
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
@@ -239,6 +247,10 @@ LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
239247
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
240248
LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
241249

250+
EXTRALIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,extra)
251+
STDLIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,std)
252+
LIBRUSTUV_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,rustuv)
253+
242254
endef
243255

244256
# $(1) is the path for directory to match against
@@ -392,42 +404,25 @@ TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
392404
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
393405

394406
# The name of the standard and extra libraries used by rustc
395-
ifdef CFG_DISABLE_SHAREDSTD
396-
HSTDLIB_DEFAULT$(1)_H_$(3) = \
397-
$$(HLIB$(1)_H_$(3))/libstd.rlib
398-
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
399-
$$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
400-
401-
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
402-
$$(HLIB$(1)_H_$(3))/libextra.rlib
403-
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
404-
$$(TLIB$(1)_T_$(2)_H_$(3))/libextra.rlib
405-
406-
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
407-
$$(HLIB$(1)_H_$(3))/librustc.rlib
408-
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
409-
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
410-
else
411-
HSTDLIB_DEFAULT$(1)_H_$(3) = \
412-
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
413-
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
414-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
415-
416-
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
417-
$$(HLIB$(1)_H_$(3))/$(CFG_EXTRALIB_$(3))
418-
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
419-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
420-
421-
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
422-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
423-
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
424-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
425-
426-
HLIBRUSTUV_DEFAULT$(1)_H_$(3) = \
427-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(3))
428-
TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
429-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
430-
endif
407+
HSTDLIB_DEFAULT$(1)_H_$(3) = \
408+
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
409+
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
410+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
411+
412+
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
413+
$$(HLIB$(1)_H_$(3))/$(CFG_EXTRALIB_$(3))
414+
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
415+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
416+
417+
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
418+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
419+
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
420+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
421+
422+
HLIBRUSTUV_DEFAULT$(1)_H_$(3) = \
423+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(3))
424+
TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
425+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
431426

432427
# Preqrequisites for using the stageN compiler
433428
HSREQ$(1)_H_$(3) = \

‎configure‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ fi
364364
BOOL_OPTIONS=""
365365
VAL_OPTIONS=""
366366

367-
opt sharedstd 1 "build libstd as a shared library"
368367
opt valgrind 0 "run tests with valgrind (memcheck by default)"
369368
opt helgrind 0 "run tests with helgrind instead of memcheck"
370369
opt docs 1 "build documentation"
@@ -398,7 +397,7 @@ valopt sysconfdir "/etc" "install system configuration files"
398397
valopt datadir "${CFG_PREFIX}/share" "install data"
399398
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
400399
valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
401-
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
400+
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
402401

403402
# Validate Options
404403
step_msg "validating $CFG_SELF args"

‎doc/rust.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,19 +1507,15 @@ an `abi` string, as shown here:
15071507
extern "stdcall" { }
15081508
~~~~
15091509

1510-
The `link_name` attribute allows the name of the library to be specified.
1510+
The `link` attribute allows the name of the library to be specified. When
1511+
specified the compiler will attempt to link against the native library of the
1512+
specified name.
15111513

15121514
~~~~ {.xfail-test}
1513-
#[link_name = "crypto"]
1515+
#[link(name = "crypto")]
15141516
extern { }
15151517
~~~~
15161518

1517-
The `nolink` attribute tells the Rust compiler
1518-
not to do any linking for the external block.
1519-
This is particularly useful for creating external blocks for libc,
1520-
which tends to not follow standard library naming conventions
1521-
and is linked to all Rust programs anyway.
1522-
15231519
The type of a function
15241520
declared in an extern block
15251521
is `extern "abi" fn(A1, ..., An) -> R`,

‎mk/clean.mk‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ clean-generic-$(2)-$(1):
5959
$(Q)find $(1)/rustllvm \
6060
$(1)/rt \
6161
$(1)/test \
62+
$(1)/stage* \
6263
-name '*.[odasS]' -o \
6364
-name '*.so' -o \
6465
-name '*.dylib' -o \
@@ -91,13 +92,16 @@ clean$(1)_H_$(2):
9192
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
9293
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
9394
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
95+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_RGLOB_$(2))
9496
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
97+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_RGLOB_$(2))
98+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTUV_GLOB_$(2))
99+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTUV_RGLOB_$(2))
95100
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
96101
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
97102
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
98103
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
99104
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
100-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
101105

102106
endef
103107

@@ -122,14 +126,16 @@ clean$(1)_T_$(2)_H_$(3):
122126
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
123127
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
124128
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
129+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_RGLOB_$(2))
125130
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
131+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_RGLOB_$(2))
126132
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_GLOB_$(2))
133+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_RGLOB_$(2))
127134
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
128135
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
129136
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
130137
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
131138
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
132-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
133139
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
134140
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix
135141
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/run_pass_stage* # For windows

‎mk/host.mk‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
5050
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
5151
$$(Q)cp $$< $$@
5252
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB_$(4)) \
53-
$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB_$(4))) \
53+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB_$(4))) \
5454
$$(HLIB$(2)_H_$(4))
5555
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
5656

@@ -82,6 +82,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
8282
| $$(HLIB$(2)_H_$(4))/
8383
@$$(call E, cp: $$@)
8484
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
85+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(4)),$$(notdir $$@))
8586
$$(Q)cp $$< $$@
8687
# Subtle: We do not let the shell expand $$(STDLIB_DSYM_GLOB) directly rather
8788
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
@@ -91,9 +92,11 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9192
# Make instead expands the glob to nothing, which gives us the correct behavior.
9293
# (Copy .dsym file if it exists, but do nothing otherwise)
9394
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
95+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_RGLOB_$(4))) \
9496
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB_$(4))) \
9597
$$(HLIB$(2)_H_$(4))
9698
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
99+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(4)),$$(notdir $$@))
97100

98101
$$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
99102
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
@@ -102,11 +105,14 @@ $$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
102105
| $$(HLIB$(2)_H_$(4))/
103106
@$$(call E, cp: $$@)
104107
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
108+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(4)),$$(notdir $$@))
105109
$$(Q)cp $$< $$@
106110
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_GLOB_$(4)) \
111+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_RGLOB_$(4))) \
107112
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_DSYM_GLOB_$(4))) \
108113
$$(HLIB$(2)_H_$(4))
109114
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
115+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(4)),$$(notdir $$@))
110116

111117
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
112118
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTUV_$(4)) \
@@ -115,35 +121,14 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
115121
| $$(HLIB$(2)_H_$(4))/
116122
@$$(call E, cp: $$@)
117123
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
124+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(4)),$$(notdir $$@))
118125
$$(Q)cp $$< $$@
119126
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTUV_GLOB_$(4)) \
127+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTUV_RGLOB_$(4))) \
120128
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTUV_DSYM_GLOB_$(4))) \
121129
$$(HLIB$(2)_H_$(4))
122130
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
123-
124-
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
125-
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
126-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
127-
| $$(HLIB$(2)_H_$(4))/
128-
@$$(call E, cp: $$@)
129-
$$(Q)cp $$< $$@
130-
131-
$$(HLIB$(2)_H_$(4))/libextra.rlib: \
132-
$$(TLIB$(1)_T_$(4)_H_$(3))/libextra.rlib \
133-
$$(HLIB$(2)_H_$(4))/libstd.rlib \
134-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
135-
| $$(HLIB$(2)_H_$(4))/
136-
@$$(call E, cp: $$@)
137-
$$(Q)cp $$< $$@
138-
139-
$$(HLIB$(2)_H_$(4))/librustc.rlib: \
140-
$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
141-
$$(HLIB$(2)_H_$(4))/libstd.rlib \
142-
$$(HLIB$(2)_H_$(4))/libextra.rlib \
143-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
144-
| $$(HLIB$(2)_H_$(4))/
145-
@$$(call E, cp: $$@)
146-
$$(Q)cp $$< $$@
131+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(4)),$$(notdir $$@))
147132

148133
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
149134
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \

‎mk/install.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
8888
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
8989
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
9090
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
91-
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
9291
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
9392
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
9493
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
@@ -101,7 +100,6 @@ install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
101100
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
102101
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
103102
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
104-
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
105103
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
106104
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
107105
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
@@ -144,13 +142,15 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
144142
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD)))
145143
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD)))
146144
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD)))
145+
$(Q)$(call INSTALL_LIB,$(STDLIB_RGLOB_$(CFG_BUILD)))
147146
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD)))
147+
$(Q)$(call INSTALL_LIB,$(EXTRALIB_RGLOB_$(CFG_BUILD)))
148148
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD)))
149+
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_RGLOB_$(CFG_BUILD)))
149150
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD)))
150151
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
151152
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))
152153
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
153-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD)))
154154
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
155155
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustc.1)
156156
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustdoc.1)
@@ -167,11 +167,13 @@ uninstall:
167167
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD))
168168
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD))
169169
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD))
170-
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD))
171170
$(Q)for i in \
172171
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD))) \
172+
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_RGLOB_$(CFG_BUILD))) \
173173
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD))) \
174+
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_RGLOB_$(CFG_BUILD))) \
174175
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_GLOB_$(CFG_BUILD))) \
176+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_RGLOB_$(CFG_BUILD))) \
175177
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD))) \
176178
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD))) \
177179
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD))) \
@@ -232,7 +234,6 @@ endif
232234
define INSTALL_RUNTIME_TARGET_N
233235
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
234236
$(Q)$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
235-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),$(CFG_RUNTIME_PUSH_DIR))
236237
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
237238
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
238239
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBRUSTUV_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
@@ -241,7 +242,6 @@ endef
241242
define INSTALL_RUNTIME_TARGET_CLEANUP_N
242243
install-runtime-target-$(1)-cleanup:
243244
$(Q)$(call ADB,remount)
244-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CFG_RUNTIME_$(1)))
245245
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
246246
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1)))
247247
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBRUSTUV_GLOB_$(1)))

‎mk/platform.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ endif
138138
endif
139139
endif
140140

141+
CFG_RLIB_GLOB=lib$(1)-*.rlib
141142

142143
# x86_64-unknown-linux-gnu configuration
143144
CC_x86_64-unknown-linux-gnu=$(CC)

‎mk/rt.mk‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJS_
121121
@$$(call E, link: $$@)
122122
$$(Q)$(AR_$(1)) rcs $$@ $$^
123123

124-
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
125-
$$(RUNTIME_DEF_$(1)_$(2))
124+
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS)
126125
@$$(call E, link: $$@)
127-
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
128-
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
126+
$$(Q)$(AR_$(1)) rcs $$@ $$(RUNTIME_OBJS_$(1)_$(2))
129127

130128
# These could go in rt.mk or rustllvm.mk, they're needed for both.
131129

‎mk/target.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
6060
| $$(TLIB$(1)_T_$(2)_H_$(3))/
6161
@$$(call E, compile_and_link: $$@)
6262
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
63+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(2)),$$(notdir $$@))
6364
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
6465
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
66+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(2)),$$(notdir $$@))
6567

6668
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
6769
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
@@ -70,8 +72,10 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
7072
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7173
@$$(call E, compile_and_link: $$@)
7274
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
75+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(2)),$$(notdir $$@))
7376
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
7477
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
78+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(2)),$$(notdir $$@))
7579

7680
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)): \
7781
$$(LIBRUSTUV_CRATE) $$(LIBRUSTUV_INPUTS) \
@@ -82,11 +86,13 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)): \
8286
| $$(TLIB$(1)_T_$(2)_H_$(3))/
8387
@$$(call E, compile_and_link: $$@)
8488
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
89+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(2)),$$(notdir $$@))
8590
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
8691
-L $$(UV_SUPPORT_DIR_$(2)) \
8792
-L $$(dir $$(LIBUV_LIB_$(2))) \
8893
--out-dir $$(@D) $$< && touch $$@
8994
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
95+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(2)),$$(notdir $$@))
9096

9197
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
9298
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \

0 commit comments

Comments
 (0)