diff options
| author | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
|---|---|---|
| committer | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
| commit | fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (patch) | |
| tree | 5a300af57c0207d38980319d54dc04218828aa1e /launcher/java | |
| parent | 0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff) | |
| parent | 9579231ccc36d9d32f4d5571ced91e8fe7851643 (diff) | |
| download | PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.gz PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.bz2 PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.zip | |
Merge remote-tracking branch 'upstream/develop' into upstream_update
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 780b23f2..8249fc29 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -31,7 +31,7 @@ JavaUtils::JavaUtils() { } -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH) { QDir mmcBin(QCoreApplication::applicationDirPath()); @@ -83,7 +83,7 @@ QProcessEnvironment CleanEnviroment() qDebug() << "Env: ignoring" << key << value; continue; } -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // Do not pass LD_* variables to java. They were intended for MultiMC if(key.startsWith("LD_")) { |