Skip to content

Commit 2b87d14

Browse files
committed
Cleanup some config stuff up
1 parent 1881087 commit 2b87d14

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

build_system/src/config.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,30 +352,21 @@ impl ConfigInfo {
352352
None => return Err("no host found".to_string()),
353353
};
354354

355-
if self.target_triple.is_empty() {
356-
// TODO: set target triple.
357-
// TODO: why do we even need to set target_triple?
358-
// It seems to only be needed for the linker (we could add an environment variable to
359-
// remove this need) and the sysroot (perhaps we could find another way to find it).
360-
// TODO TODO: seems like we would still need OVERWRITE_TARGET_TRIPLE when using a
361-
// json spec file.
362-
// ====> maybe not since we specify both --target and --target-triple.
363-
}
364355
if self.target_triple.is_empty() {
365356
self.target_triple = self.host_triple.clone();
366357
}
367358
if self.target.is_empty() && !self.target_triple.is_empty() {
368359
self.target = self.target_triple.clone();
369360
}
370361

371-
let mut linker = None;
362+
//let mut linker = None;
372363

373364
if self.host_triple != self.target_triple {
374365
if self.target_triple.is_empty() {
375366
return Err("Unknown non-native platform".to_string());
376367
}
377368
// TODO: check if this is still needed.
378-
linker = Some(format!("-Clinker={}-gcc", self.target_triple));
369+
//linker = Some(format!("-Clinker={}-gcc", self.target_triple));
379370
self.run_in_vm = true;
380371
}
381372

@@ -420,9 +411,9 @@ impl ConfigInfo {
420411
rustflags.extend_from_slice(&split_args(test_flags)?);
421412
}
422413

423-
if let Some(linker) = linker {
424-
rustflags.push(linker.to_string());
425-
}
414+
//if let Some(linker) = linker {
415+
//rustflags.push(linker.to_string());
416+
//}
426417

427418
if self.no_default_features {
428419
rustflags.push("-Csymbol-mangling-version=v0".to_string());

0 commit comments

Comments
 (0)