Bootstrap: Add argument for building embedded linker

Author: Kjetil Kjeka

src/bootstrap/configure.py

@@ -54,6 +54,7 @@ def v(*args):
 o("profiler", "build.profiler", "build the profiler runtime")
 o("full-tools", None, "enable all tools")
 o("lld", "rust.lld", "build lld")
+o("embedded-linker", "rust.embedded-linker", "build embedded linker")
 o("clang", "llvm.clang", "build clang")
 o("missing-tools", "dist.missing-tools", "allow failures when building tools")
 o("use-libcxx", "llvm.use-libcxx", "build LLVM with libc++")
@@ -365,6 +366,7 @@ def apply_args(known_args, option_checking, config):
             set('rust.codegen-backends', ['llvm'], config)
             set('rust.lld', True, config)
             set('rust.llvm-tools', True, config)
+            set('rust.embedded-linker', True, config)
             set('build.extended', True, config)
         elif option.name in ['option-checking', 'verbose-configure']:
             # this was handled above

src/bootstrap/src/core/build_steps/compile.rs

@@ -1722,6 +1722,18 @@ impl Step for Assemble {
             }
         }
 
+        if builder.config.embedded_linker_enabled {
+            let src_path = builder
+                .ensure(crate::core::build_steps::tool::EmbeddedLinker {
+                    compiler: build_compiler,
+                    target: target_compiler.host,
+                    extra_features: vec![],
+                })
+                .unwrap();
+            let tool_exe = exe("rust-embedded-linker", target_compiler.host);
+            builder.copy(&src_path, &libdir_bin.join(&tool_exe));
+        }
+
         // Ensure that `libLLVM.so` ends up in the newly build compiler directory,
         // so that it can be found when the newly built `rustc` is run.
         dist::maybe_install_llvm_runtime(builder, target_compiler.host, &sysroot);

src/bootstrap/src/core/config/config.rs

@@ -199,6 +199,7 @@ pub struct Config {
     pub use_lld: bool,
     pub lld_enabled: bool,
     pub llvm_tools_enabled: bool,
+    pub embedded_linker_enabled: bool,
 
     pub llvm_cflags: Option<String>,
     pub llvm_cxxflags: Option<String>,
@@ -1004,6 +1005,7 @@ define_config! {
         dist_src: Option<bool> = "dist-src",
         save_toolstates: Option<String> = "save-toolstates",
         codegen_backends: Option<Vec<String>> = "codegen-backends",
+        embedded_linker: Option<bool> = "embedded-linker",
         lld: Option<bool> = "lld",
         use_lld: Option<bool> = "use-lld",
         llvm_tools: Option<bool> = "llvm-tools",
@@ -1339,6 +1341,7 @@ impl Config {
         set(&mut config.local_rebuild, build.local_rebuild);
         set(&mut config.print_step_timings, build.print_step_timings);
         set(&mut config.print_step_rusage, build.print_step_rusage);
+        set(&mut config.embedded_linker_enabled, Some(true));
         config.patch_binaries_for_nix = build.patch_binaries_for_nix;
 
         config.verbose = cmp::max(config.verbose, flags.verbose as usize);
@@ -1429,6 +1432,7 @@ impl Config {
             set(&mut config.use_lld, rust.use_lld);
             set(&mut config.lld_enabled, rust.lld);
             set(&mut config.llvm_tools_enabled, rust.llvm_tools);
+            set(&mut config.embedded_linker_enabled, rust.embedded_linker);
             config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
             config.rustc_default_linker = rust.default_linker;
             config.musl_root = rust.musl_root.map(PathBuf::from);

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

@@ -140,7 +140,7 @@ ENV TARGETS=$TARGETS,x86_64-unknown-uefi
 # Luckily one of the folders is /usr/local/include so symlink /usr/include/x86_64-linux-gnu/asm there
 RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm
 
-ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
+ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enabled-embedded-linker --disable-docs \
   --set target.wasm32-wasi.wasi-root=/wasm32-wasi \
   --set target.wasm32-wasi-preview1-threads.wasi-root=/wasm32-wasi-preview1-threads \
   --musl-root-armv7=/musl-armv7