| @@ -61,15 +61,9 @@ core-cfgs = \ · 60 unmodified lines |
| 61 | 61 | --cfg no_fp_fmt_parse |
| 62 | 62 | |
| 63 | 63 | alloc-cfgs = \ |
| 64 | | − --cfg no_borrow \ |
| 65 | | − --cfg no_fmt \ |
| 66 | 64 | --cfg no_global_oom_handling \ |
| 67 | | − --cfg no_macros \ |
| 68 | 65 | --cfg no_rc \ |
| 69 | | − --cfg no_str \ |
| 70 | | − --cfg no_string \ |
| 71 | | − --cfg no_sync \ |
| 72 | | − --cfg no_thin |
| 66 | + --cfg no_sync |
| 73 | 67 | |
| 74 | 68 | quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< |
| 75 | 69 | cmd_rustdoc = \ |
| @@ -123,7 +117,7 @@ rustdoc-compiler_builtins: $(src)/compiler_builtins.rs rustdoc-core FORCE · 47 unmodified lines |
| 123 | 117 | # due to things that are "configured out" vs. entirely non-existing ones. |
| 124 | 118 | rustdoc-alloc: private rustc_target_flags = $(alloc-cfgs) \ |
| 125 | 119 | -Arustdoc::broken_intra_doc_links |
| 126 | | −rustdoc-alloc: $(src)/alloc/lib.rs rustdoc-core rustdoc-compiler_builtins FORCE |
| 120 | +rustdoc-alloc: $(RUST_LIB_SRC)/alloc/src/lib.rs rustdoc-core rustdoc-compiler_builtins FORCE |
| 127 | 121 | +$(call if_changed,rustdoc) |
| 128 | 122 | |
| 129 | 123 | rustdoc-kernel: private rustc_target_flags = --extern alloc \ |
| @@ -219,8 +213,6 @@ rusttest: rusttest-macros rusttest-kernel · 89 unmodified lines |
| 219 | 213 | # - `cargo` only considers the use case of building the standard library |
| 220 | 214 | # to use it in a given package. Thus we need to create a dummy package |
| 221 | 215 | # and pick the generated libraries from there. |
| 222 | | −# - Since we only keep a subset of upstream `alloc` in-tree, we need |
| 223 | | −# to recreate it on the fly by putting our sources on top. |
| 224 | 216 | # - The usual ways of modifying the dependency graph in `cargo` do not seem |
| 225 | 217 | # to apply for the `-Zbuild-std` steps, thus we have to mislead it |
| 226 | 218 | # by modifying the sources in the sysroot. |
| @@ -239,8 +231,6 @@ quiet_cmd_rustsysroot = RUSTSYSROOT · 12 unmodified lines |
| 239 | 231 | rm -rf $(objtree)/$(obj)/test; \ |
| 240 | 232 | mkdir -p $(objtree)/$(obj)/test; \ |
| 241 | 233 | cp -a $(rustc_sysroot) $(objtree)/$(obj)/test/sysroot; \ |
| 242 | | − cp -r $(srctree)/$(src)/alloc/* \ |
| 243 | | − $(objtree)/$(obj)/test/sysroot/lib/rustlib/src/rust/library/alloc/src; \ |
| 244 | 234 | echo '\#!/bin/sh' > $(objtree)/$(obj)/test/rustc_sysroot; \ |
| 245 | 235 | echo "$(RUSTC) --sysroot=$(abspath $(objtree)/$(obj)/test/sysroot) \"\$$@\"" \ |
| 246 | 236 | >> $(objtree)/$(obj)/test/rustc_sysroot; \ |
| @@ -448,7 +438,7 @@ $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE · 201 unmodified lines |
| 448 | 438 | $(obj)/alloc.o: private skip_clippy = 1 |
| 449 | 439 | $(obj)/alloc.o: private skip_flags = -Dunreachable_pub |
| 450 | 440 | $(obj)/alloc.o: private rustc_target_flags = $(alloc-cfgs) |
| 451 | | −$(obj)/alloc.o: $(src)/alloc/lib.rs $(obj)/compiler_builtins.o FORCE |
| 441 | +$(obj)/alloc.o: $(RUST_LIB_SRC)/alloc/src/lib.rs $(obj)/compiler_builtins.o FORCE |
| 452 | 442 | +$(call if_changed_dep,rustc_library) |
| 453 | 443 | |
| 454 | 444 | $(obj)/build_error.o: $(src)/build_error.rs $(obj)/compiler_builtins.o FORCE |