user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only set the flag in LLVM builds.

Browse source
This commit is contained in:
aspen 2020-06-30 17:56:31 -04:00
parent e191358788
commit c22bcb0381
No known key found for this signature in database
GPG key ID: 732932968965DE56
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/lib.rs
View file

@ -811,11 +811,6 @@ impl Build {
if target.contains("apple-darwin") {
base.push("-stdlib=libc++".into());
}
// Required for LLVM to properly compile.
if target.contains("apple-ios") {
base.push("-miphoneos-version-min=10.0".into());
}
// Work around an apparently bad MinGW / GCC optimization,
// See: http://lists.llvm.org/pipermail/cfe-dev/2016-December/051980.html

3
src/bootstrap/native.rs
View file

@ -420,6 +420,9 @@ fn configure_cmake(
if let Some(ref s) = builder.config.llvm_cflags {
cflags.push_str(&format!(" {}", s));
}
if target.contains("apple-ios") {
cflags.push_str(" -miphoneos-version-min=10.0");
}
cfg.define("CMAKE_C_FLAGS", cflags);
let mut cxxflags = builder.cflags(target, GitRepo::Llvm).join(" ");
if builder.config.llvm_static_stdcpp && !target.contains("msvc") && !target.contains("netbsd") {