Skip to content

Rollup of 23 pull requests #44585

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

Merged
merged 55 commits into from
Sep 15, 2017
Merged

Rollup of 23 pull requests #44585

Changes from 2 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
adfebed
Explicitly run perl for OpenSSL Configure
smaeul Aug 28, 2017
55f9087
rustdoc: Don't counts ids twice when using --enable-commonmark
ollie27 Sep 6, 2017
8e80cee
Implement named threads on Windows
jsheard Sep 6, 2017
b4d0f61
Clarify the behavior of UDP sockets wrt. multiple addresses in `connect`
tbu- Sep 7, 2017
5d3626d
Add `impl From<Vec<Span>> for MultiSpan`.
SergioBenitez Sep 9, 2017
cd1bf6d
Added short examples for 'str::from_utf8_mut'
smt923 Sep 10, 2017
51bbd69
Fix incorrect markdown title
smt923 Sep 10, 2017
f20b030
Fix trailing whitespace
smt923 Sep 10, 2017
bc1a4c6
Add doc example to String::as_mut_str
tommyip Sep 9, 2017
303b7c2
Fix markdown link for Utf8Error
smt923 Sep 10, 2017
204414b
Actually fix the trailing whitespace
smt923 Sep 10, 2017
69b9494
Alphabetize current label explanations
carols10cents Sep 10, 2017
28fc93f
Add explanations for undocumented labels
carols10cents Sep 10, 2017
18ef0de
Add doc examples to str::from_utf8_unchecked_mut
napen123 Sep 10, 2017
833a9b5
Added an example for `std::str::into_boxed_bytes()`
CodenameLambda Sep 11, 2017
f452acb
Removed trailing whitespace
CodenameLambda Sep 11, 2017
f3d6f12
update mdbook
steveklabnik Sep 11, 2017
ede6dfd
Add doc example to str::from_boxed_utf8_unchecked
tommyip Sep 11, 2017
85a9d97
rustdoc: extend UdpSocket API doc (#657)
frehberg Sep 6, 2017
b8e0989
Add an example of std::str::encode_utf16
rwakulszowa Sep 12, 2017
742ff5a
Fix rendering of const keyword for functions
GuillaumeGomez Sep 1, 2017
8adf50d
Remove Invalid UTF-8 from str::from_utf8_unchecked_mut
napen123 Sep 12, 2017
518bd30
Fix drain_filter doctest.
Sep 13, 2017
9dd2ee1
Fix example in transmute; add safety requirement to Vec::from_raw_parts
Havvy Sep 13, 2017
ccd4689
Add missing urls for OpenOptions docs
GuillaumeGomez Sep 13, 2017
c4044ee
Add note for append method in OpenOptions docs
GuillaumeGomez Sep 13, 2017
5f43357
update "since" for discriminant_value
durka Sep 13, 2017
2d292cf
Remove unneeded `loop`.
frewsxcv Sep 14, 2017
597ac36
Merge branch 'master' into threadname
jsheard Sep 14, 2017
199cb82
stabilize tcpstream_connect_timeout (closes #43079)
budziq Sep 14, 2017
168f624
"avoid" is a better word here than "disable"
est31 Sep 14, 2017
258ef37
Clarify return type of `String::from_utf16_lossy`.
frewsxcv Sep 14, 2017
76799d1
Rollup merge of #44131 - smaeul:openssl-perl, r=Mark-Simulacrum
frewsxcv Sep 15, 2017
4e646ba
Rollup merge of #44254 - GuillaumeGomez:const-fix-rustdoc, r=QuietMis…
frewsxcv Sep 15, 2017
9761a8d
Rollup merge of #44368 - ollie27:rustdoc_pulldown_ids, r=QuietMisdreavus
frewsxcv Sep 15, 2017
3ef792a
Rollup merge of #44374 - jsheard:threadname, r=alexcrichton
frewsxcv Sep 15, 2017
64690fe
Rollup merge of #44378 - frehberg:rustdoc, r=dtolnay
frewsxcv Sep 15, 2017
eb45c0a
Rollup merge of #44388 - tbu-:pr_doc_udp_connect_multiple, r=frewsxcv
frewsxcv Sep 15, 2017
5255ab7
Rollup merge of #44430 - steveklabnik:update-mdbook, r=alexcrichton
frewsxcv Sep 15, 2017
1e2d6a8
Rollup merge of #44450 - SergioBenitez:master, r=nrc
frewsxcv Sep 15, 2017
b4f6fba
Rollup merge of #44453 - tommyip:doc_string_as_mut_str, r=frewsxcv
frewsxcv Sep 15, 2017
65b9b56
Rollup merge of #44472 - smt923:master, r=frewsxcv
frewsxcv Sep 15, 2017
27b1097
Rollup merge of #44476 - integer32llc:update-label-explanation, r=Mar…
frewsxcv Sep 15, 2017
592cafe
Rollup merge of #44477 - napen123:master, r=frewsxcv
frewsxcv Sep 15, 2017
e3c4b8c
Rollup merge of #44485 - 42triangles:master, r=frewsxcv
frewsxcv Sep 15, 2017
1d361ff
Rollup merge of #44497 - tommyip:doc_example, r=frewsxcv
frewsxcv Sep 15, 2017
50240f8
Rollup merge of #44521 - rwakulszowa:str_utf16_doc, r=frewsxcv
frewsxcv Sep 15, 2017
a48cc80
Rollup merge of #44534 - adlerd:drain_filter_doctest, r=bluss
frewsxcv Sep 15, 2017
3e478fd
Rollup merge of #44536 - Havvy:transmute-docs, r=steveklabnik
frewsxcv Sep 15, 2017
b87e4f6
Rollup merge of #44541 - GuillaumeGomez:openoptions-docs, r=QuietMisd…
frewsxcv Sep 15, 2017
ffd286b
Rollup merge of #44552 - durka:patch-42, r=alexcrichton
frewsxcv Sep 15, 2017
19ad12a
Rollup merge of #44559 - frewsxcv:frewsxcv-rm-loop, r=sfackler
frewsxcv Sep 15, 2017
4af8acd
Rollup merge of #44563 - budziq:stablilize_tcpstream_connect_timeout,…
frewsxcv Sep 15, 2017
2a86884
Rollup merge of #44569 - est31:master, r=estebank
frewsxcv Sep 15, 2017
68e0f28
Rollup merge of #44572 - frewsxcv:frewsxcv-from-utf16-lossy, r=QuietM…
frewsxcv Sep 15, 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
3 changes: 2 additions & 1 deletion src/bootstrap/native.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ impl Step for Openssl {
drop(fs::remove_dir_all(&dst));
build.run(Command::new("tar").arg("xf").arg(&tarball).current_dir(&out));

let mut configure = Command::new(obj.join("Configure"));
let mut configure = Command::new("perl");
configure.arg(obj.join("Configure"));
configure.arg(format!("--prefix={}", dst.display()));
configure.arg("no-dso");
configure.arg("no-ssl2");
Expand Down