Skip to content

Commit 792e529

Browse files
committed
Merge branch 'rm-liblog' of https://github.com/alexcrichton/rust into rollup
2 parents 7ae0257 + 5f10bb5 commit 792e529

File tree

30 files changed

+63
-980
lines changed

30 files changed

+63
-980
lines changed

src/Cargo.lock

+30-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/bin/rustc.rs

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ fn main() {
7979
cmd.args(&args)
8080
.arg("--cfg")
8181
.arg(format!("stage{}", stage))
82+
.arg("--cfg").arg("rustbuild")
8283
.env(bootstrap::util::dylib_path_var(),
8384
env::join_paths(&dylib_path).unwrap());
8485

src/liblog/Cargo.toml

-9
This file was deleted.

0 commit comments

Comments
 (0)