Only set the flag in LLVM builds.

rust-lang · Jun 30, 2020 · c22bcb0 · c22bcb0
1 parent e191358
commit c22bcb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -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

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -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") {