summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-06-12 09:40:41 +0200
committerPetr Mrázek <peterix@gmail.com>2015-06-12 09:40:41 +0200
commitf723721bd0fb7880878917d87b57e7357d6667e4 (patch)
treebd251734d370c7a004e68f0e45d0ca7a068ff931 /logic
parentb427a652adc7f300d8af3f5d566b851e2d2c30eb (diff)
downloadMultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.gz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.lz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.tar.xz
MultiMC-f723721bd0fb7880878917d87b57e7357d6667e4.zip
GH-1069 env hack/passthhrough for LD_PRELOAD and LD_LIBRARY_PATH
Diffstat (limited to 'logic')
-rw-r--r--logic/BaseProcess.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp
index b9aa295c..852bec4c 100644
--- a/logic/BaseProcess.cpp
+++ b/logic/BaseProcess.cpp
@@ -100,12 +100,25 @@ void BaseProcess::init()
qDebug() << "Env: stripped" << IBUS << "from" << save << ":" << value;
}
#endif
+ if(key == "GAME_PRELOAD")
+ {
+ env.insert("LD_PRELOAD", value);
+ continue;
+ }
+ if(key == "GAME_LIBRARY_PATH")
+ {
+ env.insert("LD_LIBRARY_PATH", value);
+ continue;
+ }
qDebug() << "Env: " << key << value;
env.insert(key, value);
}
#ifdef Q_OS_LINUX
// HACK: Workaround for QTBUG-42500
- env.insert("LD_LIBRARY_PATH", "");
+ if(!env.contains("LD_LIBRARY_PATH"))
+ {
+ env.insert("LD_LIBRARY_PATH", "");
+ }
#endif
// export some infos