about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-31 22:21:20 +0000
committerbors <bors@rust-lang.org>2017-12-31 22:21:20 +0000
commitad30f5476df401abcab4c28f482091bb6d68e866 (patch)
treeac019c87dc54b69d902914677c7e4ad1485f26cb
parent9389e23a8a754097e233c7bf3ea1bb404ccf1075 (diff)
parent468523312259c851b1a409d0d7f702659bb5122d (diff)
downloadrust-ad30f5476df401abcab4c28f482091bb6d68e866.tar.gz
rust-ad30f5476df401abcab4c28f482091bb6d68e866.zip
Auto merge of #47089 - EdSchouten:cloudabi-is-not-unix, r=kennytm
Don't announce CloudABI as being UNIX.

This was originally brought in, because the definitions are based on
those of FreeBSD, Linux, etc. Even though CloudABI is based on POSIX, it
uses a subset that is so small that it's not reasonable to call it POSIX.

Now that I'm porting libstd, I'm running into some spots where I have to
explicitly disable code paths that were enabled by cfg(unix).
-rw-r--r--src/librustc_back/target/cloudabi_base.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_back/target/cloudabi_base.rs b/src/librustc_back/target/cloudabi_base.rs
index c29130bdf8e..3353e7936f0 100644
--- a/src/librustc_back/target/cloudabi_base.rs
+++ b/src/librustc_back/target/cloudabi_base.rs
@@ -23,7 +23,7 @@ pub fn opts() -> TargetOptions {
 
     TargetOptions {
         executables: true,
-        target_family: Some("unix".to_string()),
+        target_family: None,
         linker_is_gnu: true,
         pre_link_args: args,
         position_independent_executables: true,