diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-09-28 10:33:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 10:33:57 -0700 |
| commit | 723ddd1ca759ba6fb2db303456122d2d2b6a55bc (patch) | |
| tree | 64a694b3c85102d30d2c81546685e655538c0e17 /src | |
| parent | 452bb07050e720381dbf4a850e1bdb1c315318e8 (diff) | |
| parent | 5b6638ace0e615b3f271467cbf614d130b24db38 (diff) | |
| download | rust-723ddd1ca759ba6fb2db303456122d2d2b6a55bc.tar.gz rust-723ddd1ca759ba6fb2db303456122d2d2b6a55bc.zip | |
Rollup merge of #36784 - jonathandturner:env_var, r=alexcrichton
Remove requirement to use 10.7 (fixes macOS) Fixes https://github.com/rust-lang/rust/issues/36650 by removing the requirement to use 10.7. @alexcrichton pointed out that the buildbots won't be affected, since they set the requirement with an environment variable. This should now allow rustbuild to build Rust on macOS (nee OS X) r? @alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/lib.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index bcc53129f8d..784ca6f5cc4 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -659,12 +659,6 @@ impl Build { .env(format!("CFLAGS_{}", target), self.cflags(target).join(" ")); } - // If we're building for OSX, inform the compiler and the linker that - // we want to build a compiler runnable on 10.7 - if target.contains("apple-darwin") { - cargo.env("MACOSX_DEPLOYMENT_TARGET", "10.7"); - } - // Environment variables *required* needed throughout the build // // FIXME: should update code to not require this env var @@ -933,7 +927,6 @@ impl Build { // LLVM/jemalloc/etc are all properly compiled. if target.contains("apple-darwin") { base.push("-stdlib=libc++".into()); - base.push("-mmacosx-version-min=10.7".into()); } // This is a hack, because newer binutils broke things on some vms/distros // (i.e., linking against unknown relocs disabled by the following flag) |