about summary refs log tree commit diff
path: root/src/test/run-pass/thinlto
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-21 03:26:37 +0000
committerbors <bors@rust-lang.org>2017-01-21 03:26:37 +0000
commit633f38ae99b657f70e2aba135318178abc9fee16 (patch)
tree0131b807f53c9fcb750437daebe1f4227726dff5 /src/test/run-pass/thinlto
parentaedb49cbc9977fee56bb51a20980b380aca53659 (diff)
parent70d2372adaf48bb24f8b829417229149bd103e4a (diff)
downloadrust-633f38ae99b657f70e2aba135318178abc9fee16.tar.gz
rust-633f38ae99b657f70e2aba135318178abc9fee16.zip
Auto merge of #39086 - aidanhs:aphs-local-rebuild-no-jemalloc, r=alexcrichton
Make rustbuild force_alloc_system rather than relying on stage0

This 'fixes' jemalloc-less local rebuilds, where we tell cargo that we're actually stage1 (this only fixes the rustbuild path, since I wasn't enthusiastic to dive into the makefiles).

There should be one effect from this PR: `--enable-local-rebuild --disable-jemalloc` will successfully build a stage0 std (rather than erroring). Ideally I think it'd be nice to specify an allocator preference in Cargo.toml/cargo command line (used when an allocator must be picked i.e. dylibs, not rlibs), but since that's not possible we can make do with a force_alloc_system feature. Sadly this locks you into a single allocator in the build libstd, making any eventual implementation of #38575 not quite right in this edge case, but clearly not many people exercise the combination of these two flags.

This PR is also a substitute for #37975 I think. The crucial difference is that the feature name here is distinct from the jemalloc feature (reused in the previous PR) - we don't want someone to be forced into alloc_system just for disabling jemalloc!

Fixes #39054

r? @alexcrichton
Diffstat (limited to 'src/test/run-pass/thinlto')
0 files changed, 0 insertions, 0 deletions