Skip to content

Commit 92d4600

Browse files
committed
Auto merge of #38506 - alexcrichton:fix-makefiles, r=brson
mk: Fix compile with makefiles A tweak was made to dependencies in #38451 but the makefiles weren't updated to accompany this. Instead of trying to integerate the `build_helper` crate into the makefiles (which currently isn't present) this commit takes the approach of just duplicating the required logic, which should be small enough for now.
2 parents 164619a + 839b696 commit 92d4600

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/Cargo.lock

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

src/tools/compiletest/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ build = "build.rs"
88
log = "0.3"
99
env_logger = { version = "0.3.5", default-features = false }
1010
serialize = { path = "../../libserialize" }
11-
build_helper = { path = "../../build_helper" }

src/tools/compiletest/src/runtest.rs

+10-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
extern crate build_helper;
12-
1311
use common::Config;
1412
use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind};
1513
use common::{Codegen, DebugInfoLldb, DebugInfoGdb, Rustdoc, CodegenUnits};
@@ -2110,7 +2108,16 @@ actual:\n\
21102108
}
21112109
self.create_dir_racy(&tmpdir);
21122110

2113-
let mut cmd = Command::new(build_helper::make(&self.config.host));
2111+
let host = &self.config.host;
2112+
let make = if host.contains("bitrig") || host.contains("dragonfly") ||
2113+
host.contains("freebsd") || host.contains("netbsd") ||
2114+
host.contains("openbsd") {
2115+
"gmake"
2116+
} else {
2117+
"make"
2118+
};
2119+
2120+
let mut cmd = Command::new(make);
21142121
cmd.current_dir(&self.testpaths.file)
21152122
.env("TARGET", &self.config.target)
21162123
.env("PYTHON", &self.config.docck_python)

0 commit comments

Comments
 (0)