Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #39869

Closed
wants to merge 25 commits into from
Closed

Rollup of 12 pull requests #39869

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
51a2e2f
Allow more Cell methods for non-Copy types
RalfJung Feb 13, 2017
044ed10
Remove Copy bound from some Cell trait impls
RalfJung Feb 14, 2017
ca54fc7
Show five traits implementation in help when there are exactly five
seppo0010 Feb 14, 2017
b2c4e74
rustc: Link statically to the MSVCRT
alexcrichton Feb 14, 2017
aebd94f
Stabilize field init shorthand
est31 Feb 12, 2017
5156ded
make doc consistent with var name
king6cong Feb 15, 2017
938fed7
Update procedural-macros.md
DaseinPhaos Feb 15, 2017
b821313
sys/mod doc update and mod import order adjust
king6cong Feb 15, 2017
577497b
Fix typo
comonadd Feb 15, 2017
b6a1618
book: don’t use GNU extensions in the example unnecessarily
mina86 Feb 13, 2017
cf20d8e
static recursion test added to compile-fail test suite
cseale Feb 15, 2017
d5a4db3
Fix parameter to GetUserProfileDirectoryW
retep998 Feb 15, 2017
e77f856
Add a test that -fPIC is applied
brson Feb 14, 2017
7a028e5
Rollup merge of #39761 - est31:master, r=aturon
frewsxcv Feb 16, 2017
016f73b
Rollup merge of #39775 - mina86:master, r=steveklabnik
frewsxcv Feb 16, 2017
54d75ac
Rollup merge of #39793 - RalfJung:cell, r=alexcrichton
frewsxcv Feb 16, 2017
10d2f6c
Rollup merge of #39803 - brson:fpic, r=alexcrichton
frewsxcv Feb 16, 2017
4f8d4be
Rollup merge of #39804 - seppo0010:recommend-five-traits, r=jonathand…
frewsxcv Feb 16, 2017
bf5604c
Rollup merge of #39834 - cseale:feature-gate-static-recursion, r=est31
frewsxcv Feb 16, 2017
e359698
Rollup merge of #39837 - alexcrichton:llvm-crt-static, r=brson
frewsxcv Feb 16, 2017
c6bdab9
Rollup merge of #39839 - king6cong:refine-doc, r=frewsxcv
frewsxcv Feb 16, 2017
1b28c13
Rollup merge of #39840 - DaseinPhaos:patch-2, r=frewsxcv
frewsxcv Feb 16, 2017
047e310
Rollup merge of #39844 - king6cong:sys, r=alexcrichton
frewsxcv Feb 16, 2017
034acc1
Rollup merge of #39846 - WRONGWAY4YOU:typo-fix, r=frewsxcv
frewsxcv Feb 16, 2017
6343542
Rollup merge of #39861 - retep998:small-fix, r=alexcrichton
frewsxcv Feb 16, 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
5 changes: 5 additions & 0 deletions src/bootstrap/bin/rustc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ fn main() {
}
}
}

if target.contains("pc-windows-msvc") {
cmd.arg("-Z").arg("unstable-options");
cmd.arg("-C").arg("target-feature=+crt-static");
}
}

if verbose > 1 {
Expand Down
6 changes: 6 additions & 0 deletions src/bootstrap/native.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ pub fn llvm(build: &Build, target: &str) {
.define("LLVM_TARGET_ARCH", target.split('-').next().unwrap())
.define("LLVM_DEFAULT_TARGET_TRIPLE", target);

if target.contains("msvc") {
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
cfg.define("LLVM_USE_CRT_RELEASE", "MT");
cfg.define("LLVM_USE_CRT_RELWITHDEBINFO", "MT");
}

if target.starts_with("i686") {
cfg.define("LLVM_BUILD_32_BITS", "ON");
}
Expand Down