Skip to content

Commit

Permalink
rust: alloc: enable no_global_oom_handling
Browse files Browse the repository at this point in the history
Now both `alloc` and users are prepared to be compiled with
`no_global_oom_handling`.

Signed-off-by: Miguel Ojeda <[email protected]>
  • Loading branch information
ojeda committed Jul 2, 2021
1 parent 90f1659 commit 622b593
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion rust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ rustdoc-compiler_builtins: $(srctree)/rust/compiler_builtins.rs FORCE
# `no_global_oom_handling` functions refer to non-`no_global_oom_handling`
# functions. Ideally `rustdoc` would have a way to distinguish broken links
# due to things that are "configured out" vs. entirely non-existing ones.
rustdoc-alloc: private rustc_target_flags = \
rustdoc-alloc: private rustc_target_flags = --cfg no_global_oom_handling \
-Abroken_intra_doc_links
rustdoc-alloc: $(srctree)/rust/alloc/lib.rs FORCE
$(call if_changed,rustdoc)
Expand Down Expand Up @@ -276,6 +276,7 @@ $(objtree)/rust/compiler_builtins.o: $(srctree)/rust/compiler_builtins.rs \
$(call if_changed_dep,rustc_library)

$(objtree)/rust/alloc.o: private skip_clippy = 1
$(objtree)/rust/alloc.o: private rustc_target_flags = --cfg no_global_oom_handling
$(objtree)/rust/alloc.o: $(srctree)/rust/alloc/lib.rs \
$(objtree)/rust/compiler_builtins.o FORCE
$(call if_changed_dep,rustc_library)
Expand Down

0 comments on commit 622b593

Please sign in to comment.