Skip to content

Commit f262eea

Browse files
committed
Move target_family to TargetOptions, not Target
Just fixing a compile error
1 parent 31bda23 commit f262eea

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/librustc_back/target/asmjs_unknown_emscripten.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub fn target() -> Result<Target, String> {
2323
obj_is_bitcode: true,
2424
max_atomic_width: Some(32),
2525
post_link_args: vec!["-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()],
26+
target_family: Some("unix".to_string()),
2627
.. Default::default()
2728
};
2829
Ok(Target {
@@ -32,7 +33,6 @@ pub fn target() -> Result<Target, String> {
3233
target_os: "emscripten".to_string(),
3334
target_env: "".to_string(),
3435
target_vendor: "unknown".to_string(),
35-
target_family: Some("unix".to_string()),
3636
data_layout: "e-p:32:32-i64:64-v128:32:128-n32-S128".to_string(),
3737
arch: "asmjs".to_string(),
3838
options: opts,

src/librustc_back/target/wasm32_unknown_emscripten.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pub fn target() -> Result<Target, String> {
2626
max_atomic_width: Some(32),
2727
post_link_args: vec!["-s".to_string(), "BINARYEN=1".to_string(),
2828
"-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()],
29+
target_family: Some("unix".to_string()),
2930
.. Default::default()
3031
};
3132
Ok(Target {
@@ -35,7 +36,6 @@ pub fn target() -> Result<Target, String> {
3536
target_os: "emscripten".to_string(),
3637
target_env: "".to_string(),
3738
target_vendor: "unknown".to_string(),
38-
target_family: Some("unix".to_string()),
3939
data_layout: "e-p:32:32-i64:64-v128:32:128-n32-S128".to_string(),
4040
arch: "wasm32".to_string(),
4141
options: opts,

0 commit comments

Comments
 (0)