Unset LD_LIBRARY_PATH when running strip (probonopd#619)

probonopd#608
omergoktas · Oct 12, 2024 · 5734444 · 5734444
1 parent 0a29c57
commit 5734444
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/main.cpp b/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
             runStripEnabled = false;
         } else if (argument == QByteArray("-bundle-non-qt-libs")) {
             LogDebug() << "Argument found:" << argument;
-            bundleAllButCoreLibs = true;
+            bundleAllButBlacklistedLibs = true;
         } else if (argument.startsWith(QByteArray("-verbose"))) {
             LogDebug() << "Argument found:" << argument;
             int index = argument.indexOf("=");

diff --git a/shared.cpp b/shared.cpp
@@ -1055,7 +1055,9 @@ void runStrip(const QString &binaryPath)
     LogDebug() << "Using strip:";
     LogDebug() << " stripping" << resolvedPath;
     QProcess strip;
-    strip.setProcessEnvironment(systemEnvironment());
+    QProcessEnvironment stripEnv(systemEnvironment());
+    stripEnv.remove("LD_LIBRARY_PATH");
+    strip.setProcessEnvironment(stripEnv);
     strip.start("strip", QStringList() << resolvedPath);
     if (!strip.waitForStarted()) {
         if(strip.errorString().contains("execvp: No such file or directory")) {

diff --git a/tools/linuxdeployqt/CMakeLists.txt b/tools/linuxdeployqt/CMakeLists.txt