Skip to content

Commit 723ddd1

Browse files
author
Jonathan Turner
authored
Rollup merge of rust-lang#36784 - jonathandturner:env_var, r=alexcrichton
Remove requirement to use 10.7 (fixes macOS) Fixes rust-lang#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
2 parents 452bb07 + 5b6638a commit 723ddd1

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/bootstrap/lib.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -659,12 +659,6 @@ impl Build {
659659
.env(format!("CFLAGS_{}", target), self.cflags(target).join(" "));
660660
}
661661

662-
// If we're building for OSX, inform the compiler and the linker that
663-
// we want to build a compiler runnable on 10.7
664-
if target.contains("apple-darwin") {
665-
cargo.env("MACOSX_DEPLOYMENT_TARGET", "10.7");
666-
}
667-
668662
// Environment variables *required* needed throughout the build
669663
//
670664
// FIXME: should update code to not require this env var
@@ -933,7 +927,6 @@ impl Build {
933927
// LLVM/jemalloc/etc are all properly compiled.
934928
if target.contains("apple-darwin") {
935929
base.push("-stdlib=libc++".into());
936-
base.push("-mmacosx-version-min=10.7".into());
937930
}
938931
// This is a hack, because newer binutils broke things on some vms/distros
939932
// (i.e., linking against unknown relocs disabled by the following flag)

0 commit comments

Comments
 (0)