about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-11 08:46:20 -0800
committerbors <bors@rust-lang.org>2014-01-11 08:46:20 -0800
commit29e82c65b47130fb431aaca0b33935ecfcd09d85 (patch)
tree25fcf060e99571fb985a204c4ebb98171118a7a7
parent4bdda359c3cf41e36ba01ca6aef826aca7cc81c0 (diff)
parent6bbd2ed98e2332d4ba7164b7c35b9b67e0257ab3 (diff)
downloadrust-29e82c65b47130fb431aaca0b33935ecfcd09d85.tar.gz
rust-29e82c65b47130fb431aaca0b33935ecfcd09d85.zip
auto merge of #11472 : kud1ing/rust/iOS, r=alexcrichton
This fixes #11336

I guess the type sizes are correct for both OS X and iOS, but i am not certain.
In any case, i'd rather have any iOS build at all, so that we have something to improve upon.
-rw-r--r--src/libstd/libc.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs
index 1cbaa5f06a6..ac4be8fec93 100644
--- a/src/libstd/libc.rs
+++ b/src/libstd/libc.rs
@@ -1160,6 +1160,7 @@ pub mod types {
             }
         }
 
+        #[cfg(target_arch = "arm")]
         #[cfg(target_arch = "x86")]
         pub mod arch {
             pub mod c95 {