@@ -352,30 +352,21 @@ impl ConfigInfo {
352
352
None => return Err ( "no host found" . to_string ( ) ) ,
353
353
} ;
354
354
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
- }
364
355
if self . target_triple . is_empty ( ) {
365
356
self . target_triple = self . host_triple . clone ( ) ;
366
357
}
367
358
if self . target . is_empty ( ) && !self . target_triple . is_empty ( ) {
368
359
self . target = self . target_triple . clone ( ) ;
369
360
}
370
361
371
- let mut linker = None ;
362
+ // let mut linker = None;
372
363
373
364
if self . host_triple != self . target_triple {
374
365
if self . target_triple . is_empty ( ) {
375
366
return Err ( "Unknown non-native platform" . to_string ( ) ) ;
376
367
}
377
368
// 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));
379
370
self . run_in_vm = true ;
380
371
}
381
372
@@ -420,9 +411,9 @@ impl ConfigInfo {
420
411
rustflags. extend_from_slice ( & split_args ( test_flags) ?) ;
421
412
}
422
413
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
+ // }
426
417
427
418
if self . no_default_features {
428
419
rustflags. push ( "-Csymbol-mangling-version=v0" . to_string ( ) ) ;
0 commit comments