Skip to content

Commit f658691

Browse files
committed
Revert rust-lang#110 to fix iOS cross-compilation after rust-lang#158. Fixes rust-lang#173
In rust-lang#158, better support for using CMake's cross-compilation facilities was added. This made the workaround added in rust-lang#110 for iOS not only unnecessary, but actively harmful, in that it runs afoul of SDK validation checks in the CMake iOS codepath.
1 parent d1ba3ce commit f658691

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -660,12 +660,6 @@ impl Config {
660660
panic!("unsupported msvc target: {}", target);
661661
}
662662
}
663-
} else if target.contains("apple-ios") || target.contains("apple-tvos") {
664-
// These two flags prevent CMake from adding an OSX sysroot, which messes up compilation.
665-
if !self.defined("CMAKE_OSX_SYSROOT") && !self.defined("CMAKE_OSX_DEPLOYMENT_TARGET") {
666-
cmd.arg("-DCMAKE_OSX_SYSROOT=/");
667-
cmd.arg("-DCMAKE_OSX_DEPLOYMENT_TARGET=");
668-
}
669663
} else if target.contains("darwin") {
670664
if !self.defined("CMAKE_OSX_ARCHITECTURES") {
671665
if target.contains("x86_64") {

0 commit comments

Comments
 (0)