[build] Add SONAME at link time instead of using patchelf (#1258)

Add SONAME at link time instead of using patchelf

Fix format

Author: gleocadie

builder/src/arch/apple.rs

@@ -52,6 +52,4 @@ pub fn strip_libraries(lib_path: &str) {
     strip.wait().expect("Failed to strip library");
 }
 
-pub fn fix_soname(_lib_path: &str) {}
-
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}

builder/src/arch/linux.rs

@@ -12,7 +12,12 @@ pub const PROF_DYNAMIC_LIB_FFI: &str = "libdatadog_profiling_ffi.so";
 pub const PROF_STATIC_LIB_FFI: &str = "libdatadog_profiling_ffi.a";
 pub const REMOVE_RPATH: bool = false;
 pub const BUILD_CRASHTRACKER: bool = true;
-pub const RUSTFLAGS: [&str; 2] = ["-C", "relocation-model=pic"];
+pub const RUSTFLAGS: [&str; 4] = [
+    "-C",
+    "relocation-model=pic",
+    "-C",
+    "link-arg=-Wl,-soname,libdatadog_profiling.so",
+];
 
 pub fn fix_rpath(lib_path: &str) {
     if REMOVE_RPATH {
@@ -62,15 +67,4 @@ pub fn strip_libraries(lib_path: &str) {
     debug.wait().expect("Failed to set debuglink");
 }
 
-pub fn fix_soname(lib_path: &str) {
-    let mut patch_soname = Command::new("patchelf")
-        .arg("--set-soname")
-        .arg(PROF_DYNAMIC_LIB)
-        .arg(lib_path.to_owned() + "/" + PROF_DYNAMIC_LIB)
-        .spawn()
-        .expect("failed to span patchelf");
-
-    patch_soname.wait().expect("failed to change the soname");
-}
-
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}

builder/src/arch/musl.rs

@@ -12,7 +12,12 @@ pub const PROF_DYNAMIC_LIB_FFI: &str = "libdatadog_profiling_ffi.so";
 pub const PROF_STATIC_LIB_FFI: &str = "libdatadog_profiling_ffi.a";
 pub const REMOVE_RPATH: bool = false;
 pub const BUILD_CRASHTRACKER: bool = true;
-pub const RUSTFLAGS: [&str; 2] = ["-C", "relocation-model=pic"];
+pub const RUSTFLAGS: [&str; 4] = [
+    "-C",
+    "relocation-model=pic",
+    "-C",
+    "link-arg=-Wl,-soname,libdatadog_profiling.so",
+];
 
 pub fn fix_rpath(lib_path: &str) {
     if REMOVE_RPATH {
@@ -60,15 +65,4 @@ pub fn strip_libraries(lib_path: &str) {
     debug.wait().expect("Failed to set debuglink");
 }
 
-pub fn fix_soname(lib_path: &str) {
-    let mut patch_soname = Command::new("patchelf")
-        .arg("--set-soname")
-        .arg(PROF_DYNAMIC_LIB)
-        .arg(lib_path.to_owned() + "/" + PROF_DYNAMIC_LIB)
-        .spawn()
-        .expect("failed to spawn patchelf");
-
-    patch_soname.wait().expect("failed to change the soname");
-}
-
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}

builder/src/arch/windows.rs

@@ -23,7 +23,6 @@ pub const RUSTFLAGS: [&str; 4] = [
 
 pub fn fix_rpath(_lib_path: &str) {}
 pub fn strip_libraries(_lib_path: &str) {}
-pub fn fix_soname(_lib_path: &str) {}
 
 pub fn add_additional_files(lib_path: &str, target_path: &OsStr) {
     let from_pdb: PathBuf = [lib_path, PROF_PDB_FFI].iter().collect();

builder/src/profiling.rs

@@ -109,8 +109,6 @@ impl Profiling {
 
         arch::add_additional_files(&self.source_lib, lib_dir.as_os_str());
 
-        arch::fix_soname(&self.target_lib);
-
         // Generate debug information
         arch::strip_libraries(&self.target_lib);
         Ok(())