diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 11:13:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 11:13:42 -0800 |
| commit | 10893a9a349cdd423f2490a6984acb5b3b7c8046 (patch) | |
| tree | 106134ecd115ef74c6d4994e50fb34e60eed083c /src/tools | |
| parent | ad78c04a9a0abd5b2332b5046060f16edef2b05b (diff) | |
| parent | 5466c1bc80ad7cf08d71e77e7af3d17a24b50f36 (diff) | |
| download | rust-1.15.0.tar.gz rust-1.15.0.zip | |
Merge pull request #39189 from brson/beta-next 1.15.0
Beta next
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 3cc14541fcd..94461cd8e07 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2108,7 +2108,16 @@ actual:\n\ } self.create_dir_racy(&tmpdir); - let mut cmd = Command::new("make"); + let host = &self.config.host; + let make = if host.contains("bitrig") || host.contains("dragonfly") || + host.contains("freebsd") || host.contains("netbsd") || + host.contains("openbsd") { + "gmake" + } else { + "make" + }; + + let mut cmd = Command::new(make); cmd.current_dir(&self.testpaths.file) .env("TARGET", &self.config.target) .env("PYTHON", &self.config.docck_python) |