Set rpath via ldflags

saltstack · Oct 28, 2023 · fcd6374 · fcd6374
1 parent 271ced3
commit fcd6374
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/relenv_gdb/build.py b/src/relenv_gdb/build.py
@@ -78,6 +78,9 @@ def build_gdb(prefix):
     dir_name = archive_name.split(".tar")[0]
     # os.environ["LDFLAGS"] = f"{os.environ['LDFLAGS']} '-Wl,-rpath=$$ORIGIN/../lib'"
     # os.environ["LDFLAGS"] += f" -Wl,-rpath={os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib"
+    os.environ[
+        "LDFLAGS"
+    ] += f" -Wl,-rpath={os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib"
     with pushd(src / dir_name):
         subprocess.run(
             [
@@ -90,22 +93,22 @@ def build_gdb(prefix):
         )
         subprocess.run(["make"])
         # subprocess.run(["patchelf", "--add-rpath", "$ORIGIN/../lib", "gdb/gdb"])
-        subprocess.run(
-            [
-                "patchelf",
-                "--add-rpath",
-                f"{os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib",
-                "gdb/gdb",
-            ]
-        )
-        subprocess.run(
-            [
-                "patchelf",
-                "--add-rpath",
-                f"{os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib",
-                "gdbserver/gdbserver",
-            ]
-        )
+        # subprocess.run(
+        #     [
+        #         "patchelf",
+        #         "--add-rpath",
+        #         f"{os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib",
+        #         "gdb/gdb",
+        #     ]
+        # )
+        # subprocess.run(
+        #     [
+        #         "patchelf",
+        #         "--add-rpath",
+        #         f"{os.environ['TOOLCHAIN_PATH']}/{os.environ['TRIPLET']}/sysroot/lib",
+        #         "gdbserver/gdbserver",
+        #     ]
+        # )
         subprocess.run(["make", "install"])
 
     # relenv.relocate.main(os.environ["RELENV_PATH"])