Add dsymutil binary for x86_64.

WINSDK · Apr 19, 2024 · fbc50f5 · fbc50f5
1 parent e910701
commit fbc50f5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/debugvault/bin/dsymutil → debugvault/bin/dsymutil_aarch64 b/debugvault/bin/dsymutil → debugvault/bin/dsymutil_aarch64
diff --git a/debugvault/bin/dsymutil_x86_64 b/debugvault/bin/dsymutil_x86_64
diff --git a/debugvault/src/lib.rs b/debugvault/src/lib.rs
@@ -137,8 +137,8 @@ impl Index {
         let mut this = Self::default();
 
         let dwarf = match obj {
-            object::File::MachO32(_) => macho_dwarf(obj, path)?,
-            object::File::MachO64(_) => macho_dwarf(obj, path)?,
+            #[cfg(target_os = "macos")]
+            object::File::MachO32(_) | object::File::MachO64(_) => macho_dwarf(obj, path)?,
             _ => dwarf::Dwarf::parse(obj)?,
         };
 
@@ -310,21 +310,28 @@ pub fn macho_dwarf(obj: &object::File, path: &Path) -> Result<Dwarf, dwarf::Erro
         .join(path.file_name().unwrap());
 
     if !opt_dsym.is_file() {
-        let dsymutil_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("bin/dsymutil");
-        assert!(dsymutil_path.exists(), "dsymutil somehow missing");
-
-        log::PROGRESS.set("Running dsymutil.", 1);
-        let exit_status =
-            Command::new(dsymutil_path).arg("--linker=parallel").arg(path).spawn()?.wait()?;
-        log::PROGRESS.step();
-
-        if !exit_status.success() {
-            log::complex!(
-                w "[macho::dwarf] ",
-                y "Generating dSym failed with exit code ",
-                g exit_status.code().unwrap_or(1).to_string(),
-                y "."
-            );
+        #[cfg(target_arch = "x86_64")]
+        let dsymutil_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("bin/dsymutil_x86_64");
+        #[cfg(target_arch = "aarch64")]
+        let dsymutil_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("bin/dsymutil_aarch64");
+
+        if dsymutil_path.exists() {
+            log::PROGRESS.set("Running dsymutil.", 1);
+            let exit_status = Command::new(dsymutil_path)
+                .arg("--linker=parallel")
+                .arg(path)
+                .spawn()?
+                .wait()?;
+            log::PROGRESS.step();
+
+            if !exit_status.success() {
+                log::complex!(
+                    w "[macho::dwarf] ",
+                    y "Generating dSym failed with exit code ",
+                    g exit_status.code().unwrap_or(1).to_string(),
+                    y "."
+                );
+            }
         }
     }
 

diff --git a/gui/src/widgets/text_edit.rs b/gui/src/widgets/text_edit.rs
@@ -85,7 +85,7 @@ impl TextEditState {
         ctx.data_mut(|d| d.insert_persisted(id, self));
     }
 
-    /// The the currently selected range of characters.
+    /// The currently selected range of characters.
     pub fn ccursor_range(&self) -> Option<CCursorRange> {
         self.ccursor_range
             .or_else(|| self.cursor_range.map(|cursor_range| cursor_range.as_ccursor_range()))