diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-01-16 13:24:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-16 13:24:26 -0500 |
commit | 2047bb81dcdb311f10e4915f75245768d54137dd (patch) | |
tree | b1dcac22e3b5b7f4da6155598c66681608936c5b | |
parent | Merge pull request #1024 from willakat/master (diff) | |
parent | Unset LD_LIBRARY_PATH, unless specified (diff) | |
download | sway-2047bb81dcdb311f10e4915f75245768d54137dd.tar.gz sway-2047bb81dcdb311f10e4915f75245768d54137dd.tar.zst sway-2047bb81dcdb311f10e4915f75245768d54137dd.zip |
Merge pull request #1050 from Hummer12007/cmake
Unset LD_LIBRARY_PATH, unless specified
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | sway/main.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea0e3648..74c79075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -47,9 +47,11 @@ option(enable-swaymsg "Enables the swaymsg utility" YES) | |||
47 | option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) | 47 | option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) |
48 | option(zsh-completions "Zsh shell completions" NO) | 48 | option(zsh-completions "Zsh shell completions" NO) |
49 | option(default-wallpaper "Installs the default wallpaper" YES) | 49 | option(default-wallpaper "Installs the default wallpaper" YES) |
50 | set(LD_LIBRARY_PATH "/usr/lib" CACHE STRING "Configures sway's default LD_LIBRARY_PATH") | 50 | option(LD_LIBRARY_PATH "Configure sway's default LD_LIBRARY_PATH") |
51 | 51 | ||
52 | add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") | 52 | if (LD_LIBRARY_PATH) |
53 | add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") | ||
54 | endif() | ||
53 | 55 | ||
54 | find_package(JsonC REQUIRED) | 56 | find_package(JsonC REQUIRED) |
55 | find_package(PCRE REQUIRED) | 57 | find_package(PCRE REQUIRED) |
diff --git a/sway/main.c b/sway/main.c index 7bf71b53..1c4c56c0 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -214,7 +214,11 @@ int main(int argc, char **argv) { | |||
214 | 214 | ||
215 | // Security: | 215 | // Security: |
216 | unsetenv("LD_PRELOAD"); | 216 | unsetenv("LD_PRELOAD"); |
217 | #ifdef _LD_LIBRARY_PATH | ||
217 | setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1); | 218 | setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1); |
219 | #else | ||
220 | unsetenv("LD_LIBRARY_PATH"); | ||
221 | #endif | ||
218 | 222 | ||
219 | int c; | 223 | int c; |
220 | while (1) { | 224 | while (1) { |