Merge pull request #118 from tti0/theodoretucker/rust-lld-error

Handle case where `rust-lld` is not in path

Author: Urhengulas

CHANGELOG.md

@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- [#118] Handle case where rust-lld is not in path
 - [#109] Don't cache, because it is slow
 - [#108] CI: Update cargo-dist to v0.1.27
 
+[#118]: https://github.com/knurling-rs/flip-link/pull/118
 [#109]: https://github.com/knurling-rs/flip-link/pull/109
 [#108]: https://github.com/knurling-rs/flip-link/pull/107
 

src/linking.rs

@@ -4,7 +4,7 @@ use std::{
     process::{Command, ExitStatus},
 };
 
-const LINKER: &str = "rust-lld";
+pub const LINKER: &str = "rust-lld";
 
 /// Normal linking with just the arguments the user provides
 pub fn link_normally(args: &[String]) -> io::Result<ExitStatus> {

src/main.rs

@@ -5,7 +5,7 @@ use std::{
     borrow::Cow,
     env,
     fs::{self, File},
-    io::Write,
+    io::{ErrorKind::NotFound, Write},
     ops::RangeInclusive,
     path::{Path, PathBuf},
     process,
@@ -41,7 +41,19 @@ fn notmain() -> Result<i32> {
     }
 
     {
-        let exit_status = linking::link_normally(&raw_args)?;
+        let exit_status = match linking::link_normally(&raw_args) {
+            Ok(status) => status,
+            Err(e) => {
+                if e.kind() == NotFound {
+                    eprintln!(
+                        "flip-link: Could not find the default linker ({}) in your path",
+                        linking::LINKER
+                    );
+                }
+                Err(Box::new(e))
+            }?,
+        };
+
         if !exit_status.success() {
             eprintln!(
                 "\nflip-link: the native linker failed to link the program normally; \
@@ -111,7 +123,19 @@ fn notmain() -> Result<i32> {
         }
         new_linker_script.flush()?;
 
-        let exit_status = linking::link_modified(&raw_args, &current_dir, tempdir, new_origin)?;
+        let exit_status = match linking::link_modified(&raw_args, &current_dir, tempdir, new_origin)
+        {
+            Ok(status) => status,
+            Err(e) => {
+                if e.kind() == NotFound {
+                    eprintln!(
+                        "flip-link: Could not find the default linker ({}) in your path",
+                        linking::LINKER
+                    );
+                }
+                Err(Box::new(e))
+            }?,
+        };
         Ok(exit_status)
     })?;