Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0da8995
Export attributes in save-analysis data
jonasbb Feb 14, 2017
346aed2
Store attributes as strings
jonasbb Feb 23, 2017
5bfa0f3
Move remove_docs_from_attrs into lowering step
jonasbb Mar 2, 2017
5945d1d
Remove ability for plugins to register a MIR pass
nagisa Mar 3, 2017
6698fb6
Add catch expr to AST and disallow catch as a struct name
cramertj Feb 17, 2017
ace24bb
Temporarily prefix catch block with do keyword
cramertj Mar 3, 2017
cd7bde9
Point to enclosing block/fn on nested unsafe
estebank Jan 20, 2017
eeb7af6
rustbuild: Build documentation for `proc_macro`
alexcrichton Mar 1, 2017
4f424b3
Add compile-fail tests for catch expr in match or condition
cramertj Mar 7, 2017
9efee16
Allow lints to check Bodys directly
oli-obk Mar 7, 2017
c51a39d
Removed RustFMT changes
jdhorwitz Mar 8, 2017
4eeede3
fix emscripten test detection
TimNN Mar 4, 2017
57c989c
Fix botched member variable rename
shepmaster Mar 4, 2017
3e2390f
Restore creating the channel-rust-$channel-date.txt files
shepmaster Mar 3, 2017
58ff4f6
rustbuild: expose LLVM_PARALLEL_LINK_JOBS
Mar 5, 2017
c6153b2
Rollup merge of #39202 - estebank:nested-unsafe, r=jonathandturner
frewsxcv Mar 9, 2017
0f1847c
Rollup merge of #39820 - jonasbb:export-attributes, r=nrc
frewsxcv Mar 9, 2017
ded49bc
Rollup merge of #39921 - cramertj:add-catch-to-ast, r=nikomatsakis
frewsxcv Mar 9, 2017
ca9b2c8
Rollup merge of #40199 - alexcrichton:doc-proc-macro, r=brson
frewsxcv Mar 9, 2017
a41bc06
Rollup merge of #40225 - shepmaster:restore-build-date-file, r=alexcr…
frewsxcv Mar 9, 2017
b7bd3fa
Rollup merge of #40239 - nagisa:death-to-plugins, r=nikomatsakis
frewsxcv Mar 9, 2017
6cba0f9
Rollup merge of #40259 - TimNN:fix-emscripten-tests, r=alexcrichton
frewsxcv Mar 9, 2017
359377d
Rollup merge of #40277 - rkruppe:llvm-parallel-link-jobs, r=alexcrichton
frewsxcv Mar 9, 2017
c134617
Rollup merge of #40312 - jdhorwitz:papercut, r=steveklabnik
frewsxcv Mar 9, 2017
d3c4375
Rollup merge of #40315 - oli-obk:lint_body, r=eddyb
frewsxcv Mar 9, 2017
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
rustbuild: expose LLVM_PARALLEL_LINK_JOBS
This allows limiting the number of linker jobs to avoid swapping when
linking LLVM with debug info.
  • Loading branch information
Robin Kruppe committed Mar 9, 2017
commit 58ff4f67e3a1d099d3c4cb8ccb554ee9fd0a16cd
3 changes: 3 additions & 0 deletions src/bootstrap/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub struct Config {
pub llvm_static_stdcpp: bool,
pub llvm_link_shared: bool,
pub llvm_targets: Option<String>,
pub llvm_link_jobs: Option<u32>,

// rust codegen options
pub rust_optimize: bool,
Expand Down Expand Up @@ -179,6 +180,7 @@ struct Llvm {
version_check: Option<bool>,
static_libstdcpp: Option<bool>,
targets: Option<String>,
link_jobs: Option<u32>,
}

#[derive(RustcDecodable, Default, Clone)]
Expand Down Expand Up @@ -333,6 +335,7 @@ impl Config {
set(&mut config.llvm_version_check, llvm.version_check);
set(&mut config.llvm_static_stdcpp, llvm.static_libstdcpp);
config.llvm_targets = llvm.targets.clone();
config.llvm_link_jobs = llvm.link_jobs;
}

if let Some(ref rust) = toml.rust {
Expand Down
8 changes: 8 additions & 0 deletions src/bootstrap/config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@
# Rust team and file an issue if you need assistance in porting!
#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX"

# Cap the number of parallel linker invocations when compiling LLVM.
# This can be useful when building LLVM with debug info, which significantly
# increases the size of binaries and consequently the memory required by
# each linker process.
# If absent or 0, linker invocations are treated like any other job and
# controlled by rustbuild's -j parameter.
#link-jobs = 0

# =============================================================================
# General build configuration options
# =============================================================================
Expand Down
6 changes: 6 additions & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ pub fn llvm(build: &Build, target: &str) {
cfg.define("LLVM_BUILD_32_BITS", "ON");
}

if let Some(num_linkers) = build.config.llvm_link_jobs {
if num_linkers > 0 {
cfg.define("LLVM_PARALLEL_LINK_JOBS", num_linkers.to_string());
}
}

// http://llvm.org/docs/HowToCrossCompileLLVM.html
if target != build.config.build {
// FIXME: if the llvm root for the build triple is overridden then we
Expand Down