diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-20 11:16:40 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-20 12:59:07 -0800 |
| commit | 60842c1c1fdb69bccc58613e26f1c9661ca8bd39 (patch) | |
| tree | f4c8c604dacf2d9b3fd1d491fb1bd3976238340e /src/libstd | |
| parent | a8e7f9530a623ea7ca37c556c2822ae8c3bfa339 (diff) | |
| parent | 2c39ee12a99f9548a5e379e8bcea4f7923028fee (diff) | |
| download | rust-60842c1c1fdb69bccc58613e26f1c9661ca8bd39.tar.gz rust-60842c1c1fdb69bccc58613e26f1c9661ca8bd39.zip | |
Rollup merge of #38451 - semarie:openbsd-rustbuild, r=alexcrichton
adaptation to rustbuild for openbsd Since the switch to rustbuild, the build for openbsd is broken: - [X] `ar` inference based on compiler name is wrong (OpenBSD usually use `egcc`, but `ear` doesn't exist) - [X] `make` isn't GNU-make under OpenBSD (and others BSD platforms) - [x] `stdc++` isn't the right stdc++ library to link with (it should be `estdc++`) - [x] corrects tests that don't pass anymore (problems related to rustbuild) r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/build.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 1087d1f2447..b3eba508316 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -104,7 +104,7 @@ fn build_libbacktrace(host: &str, target: &str) { .env("AR", &ar) .env("RANLIB", format!("{} s", ar.display())) .env("CFLAGS", cflags)); - run(Command::new("make") + run(Command::new(build_helper::make(host)) .current_dir(&build_dir) .arg(format!("INCDIR={}", src_dir.display())) .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set"))); |