diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-25 14:03:44 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-25 14:03:44 -0800 |
| commit | f262eea2ee0108586d53d6181f813b288de50209 (patch) | |
| tree | 71c86f11da533fbe3e355db008aea04868ad51fe | |
| parent | 31bda236bd7573482614f86998536ce3b2ba98f5 (diff) | |
| download | rust-f262eea2ee0108586d53d6181f813b288de50209.tar.gz rust-f262eea2ee0108586d53d6181f813b288de50209.zip | |
Move target_family to TargetOptions, not Target
Just fixing a compile error
| -rw-r--r-- | src/librustc_back/target/asmjs_unknown_emscripten.rs | 2 | ||||
| -rw-r--r-- | src/librustc_back/target/wasm32_unknown_emscripten.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/asmjs_unknown_emscripten.rs b/src/librustc_back/target/asmjs_unknown_emscripten.rs index 51befa78ed3..98a9e343d00 100644 --- a/src/librustc_back/target/asmjs_unknown_emscripten.rs +++ b/src/librustc_back/target/asmjs_unknown_emscripten.rs @@ -23,6 +23,7 @@ pub fn target() -> Result<Target, String> { obj_is_bitcode: true, max_atomic_width: Some(32), post_link_args: vec!["-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()], + target_family: Some("unix".to_string()), .. Default::default() }; Ok(Target { @@ -32,7 +33,6 @@ pub fn target() -> Result<Target, String> { target_os: "emscripten".to_string(), target_env: "".to_string(), target_vendor: "unknown".to_string(), - target_family: Some("unix".to_string()), data_layout: "e-p:32:32-i64:64-v128:32:128-n32-S128".to_string(), arch: "asmjs".to_string(), options: opts, diff --git a/src/librustc_back/target/wasm32_unknown_emscripten.rs b/src/librustc_back/target/wasm32_unknown_emscripten.rs index 574dbe980f1..fec269074da 100644 --- a/src/librustc_back/target/wasm32_unknown_emscripten.rs +++ b/src/librustc_back/target/wasm32_unknown_emscripten.rs @@ -26,6 +26,7 @@ pub fn target() -> Result<Target, String> { max_atomic_width: Some(32), post_link_args: vec!["-s".to_string(), "BINARYEN=1".to_string(), "-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()], + target_family: Some("unix".to_string()), .. Default::default() }; Ok(Target { @@ -35,7 +36,6 @@ pub fn target() -> Result<Target, String> { target_os: "emscripten".to_string(), target_env: "".to_string(), target_vendor: "unknown".to_string(), - target_family: Some("unix".to_string()), data_layout: "e-p:32:32-i64:64-v128:32:128-n32-S128".to_string(), arch: "wasm32".to_string(), options: opts, |