From 34e354c8fef3961f01736b2532bdd407ba0e1a74 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 28 Apr 2011 11:35:57 +0200 Subject: [PATCH] Don't adjust DYLD_LIBRARY_PATH in run environments. Reviewed-by: con --- src/libs/utils/environment.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 6ea9ce9d3e5..73a2fff92bb 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -184,11 +184,10 @@ void Environment::prependOrSetLibrarySearchPath(const QString &value) #ifdef Q_OS_WIN const QLatin1String path("PATH"); -#elif defined(Q_OS_MAC) - const QLatin1String path("DYLD_LIBRARY_PATH"); -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) const QLatin1String path("LD_LIBRARY_PATH"); #else + // we could set DYLD_LIBRARY_PATH on Mac but it is unnecessary in practice return; #endif