Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
688e05b
add allocator libraries compatible with the new rustc mangling
krasimirgg Apr 10, 2025
97d65c6
fixes
krasimirgg Apr 10, 2025
09ef052
fixes
krasimirgg Apr 10, 2025
aef67c7
add global alloc support and tests
krasimirgg Apr 11, 2025
2c20ec4
add a way to control rustc allocator libraries feature per-toolchain
krasimirgg Apr 15, 2025
fdfa08e
add to its own attribute dict
krasimirgg Apr 15, 2025
bc47c49
formatting
krasimirgg Apr 15, 2025
34770cb
formatting
krasimirgg Apr 15, 2025
911f877
reformat
krasimirgg Apr 15, 2025
3c2746d
Merge branch 'bazelbuild:main' into rustc_std_internal_symbols
krasimirgg Apr 28, 2025
161c960
add nostd test and fix
krasimirgg Apr 28, 2025
9e2c701
mv no_std tests to top-level
krasimirgg Apr 28, 2025
78d8446
merge new and old no_std tests
krasimirgg Apr 29, 2025
705bdfc
unify cc_common_link tests
krasimirgg Apr 29, 2025
78c46cd
unify cc_common_link_with_global_alloc tests
krasimirgg Apr 29, 2025
a9914a4
try to pass the alloc lib expliticly
krasimirgg Apr 29, 2025
f5b87b0
ditto
krasimirgg Apr 29, 2025
b3a613b
put the alloc libs at the bottom of stdlibs
krasimirgg May 6, 2025
08f1c2b
Merge branch 'bazelbuild:main' into rustc_std_internal_symbols
krasimirgg May 6, 2025
2dad832
adapt allocator libs to be deps of liballoc
krasimirgg May 6, 2025
47505fd
add an alloc impl provider
krasimirgg May 8, 2025
322af5c
Merge branch 'main' into rustc_std_internal_symbols
krasimirgg Jun 3, 2025
547a4f5
Merge branch 'bazelbuild:main' into rustc_std_internal_symbols
krasimirgg Jun 24, 2025
609020e
add some docs
krasimirgg Jun 24, 2025
c6a4c27
Merge branch 'main' into rustc_std_internal_symbols
krasimirgg Jul 2, 2025
4cbd58b
fixup buildifier
krasimirgg Jul 2, 2025
cc5e4d1
fix buildifier
krasimirgg Jul 2, 2025
c53928f
Trigger Build
krasimirgg Jul 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix buildifier
  • Loading branch information
krasimirgg committed Jul 2, 2025
commit cc5e4d1d6ccbf252e1955ebc9c3553859c6b1e9c
9 changes: 5 additions & 4 deletions rust/private/rustc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1625,26 +1625,27 @@ def _get_std_and_alloc_info(ctx, toolchain, crate_info):
#
# When provided, the allocator_libraries attribute takes precedence over the
# toolchain allocator attributes.
libs = None
attr_allocator_library = None
attr_global_allocator_library = None
if _should_use_rustc_allocator_libraries(toolchain) and hasattr(ctx.attr, "allocator_libraries"):
libs = ctx.attr.allocator_libraries[AllocatorLibrariesInfo]
attr_allocator_library = libs.allocator_library
attr_global_allocator_library = libs.global_allocator_library
if is_exec_configuration(ctx):
if libs and attr_allocator_library:
if attr_allocator_library:
return libs.libstd_and_allocator_ccinfo
return toolchain.libstd_and_allocator_ccinfo
if toolchain._experimental_use_global_allocator:
if _is_no_std(ctx, toolchain, crate_info):
if libs and attr_global_allocator_library:
if attr_global_allocator_library:
return libs.nostd_and_global_allocator_ccinfo
return toolchain.nostd_and_global_allocator_ccinfo
else:
if libs and attr_global_allocator_library:
if attr_global_allocator_library:
return libs.libstd_and_global_allocator_ccinfo
return toolchain.libstd_and_global_allocator_ccinfo
if libs and attr_allocator_library:
if attr_allocator_library:
return libs.libstd_and_allocator_ccinfo
return toolchain.libstd_and_allocator_ccinfo

Expand Down