Merge pull request #2734 from ivyl/use_rpath

Add support for installing binaries with DT_RPATH

2 files changed, 1 insertions, 8 deletions

diff --git a/sway/main.c b/sway/main.c
index 50b05b21..dea4a31c 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -241,14 +241,6 @@ int main(int argc, char **argv) {
                 "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
                 "\n";
 
-        // Security:
-        unsetenv("LD_PRELOAD");
-#ifdef _LD_LIBRARY_PATH
-        setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1);
-#else
-        unsetenv("LD_LIBRARY_PATH");
-#endif
-
         int c;
         while (1) {
                 int option_index = 0;
diff --git a/sway/meson.build b/sway/meson.build
index b6394ecb..6eb9a9d7 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -187,5 +187,6 @@ executable(
         include_directories: [sway_inc],
         dependencies: sway_deps,
         link_with: [lib_sway_common],
+        install_rpath : rpathdir,
         install: true
 )