Skip to content

Commit 6d5a0f1

Browse files
committed
Fix esp8266 linker
1 parent b6ce72d commit 6d5a0f1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ impl Config {
544544
set(&mut config.llvm_static_stdcpp, llvm.static_libstdcpp);
545545
set(&mut config.llvm_link_shared, llvm.link_shared);
546546
config.llvm_targets = llvm.targets.clone();
547-
config.llvm_experimental_targets = Some(llvm.experimental_targets.clone().unwrap_or("Xtensa".to_string()));
547+
config.llvm_experimental_targets = llvm.experimental_targets.clone();
548548
config.llvm_link_jobs = llvm.link_jobs;
549549
config.llvm_version_suffix = llvm.version_suffix.clone();
550550
config.llvm_clang_cl = llvm.clang_cl.clone();

src/librustc_target/spec/xtensa_esp8266_none_elf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515

1616
options: TargetOptions {
1717
cpu: "esp8266".to_string(),
18-
linker: Some("xtensa-esp32-elf-ld".to_string()),
18+
linker: Some("xtensa-lx106-elf-gcc".to_string()),
1919

2020
max_atomic_width: Some(32),
2121

0 commit comments

Comments
 (0)