[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [craft] bin: Set DYLD_FRAMEWORK_PATH on mac
From:       Hannah von Reth <null () kde ! org>
Date:       2018-09-21 22:21:50
Message-ID: E1g3To6-0003ZP-6p () code ! kde ! org
[Download RAW message or body]

Git commit 2056fabb6fc0c06de511ab7497aa4c04f1fc1ade by Hannah von Reth.
Committed on 21/09/2018 at 22:21.
Pushed by vonreth into branch 'master'.

Set DYLD_FRAMEWORK_PATH on mac

M  +5    -5    bin/CraftSetupHelper.py

https://commits.kde.org/craft/2056fabb6fc0c06de511ab7497aa4c04f1fc1ade

diff --git a/bin/CraftSetupHelper.py b/bin/CraftSetupHelper.py
index 8d6304cbf..badd6361f 100644
--- a/bin/CraftSetupHelper.py
+++ b/bin/CraftSetupHelper.py
@@ -259,11 +259,11 @@ class SetupHelper(object):
                            os.path.join(CraftStandardDirs.craftRoot(), "ho=
me", os.getenv("USER"), ".cache"))
 =

     def _setupUnix(self):
-        self.prependEnvVar("LD_LIBRARY_PATH", [os.path.join(CraftStandardD=
irs.craftRoot(), "lib"),
-                                             os.path.join(CraftStandardDir=
s.craftRoot(), "lib", "x86_64-linux-gnu")])
-        # Setting DYLD_LIBRARY_PATH often causes issues, so let's disable =
this for now
-        #if OsUtils.isMac():
-        #    self.prependEnvVar("DYLD_LIBRARY_PATH", [os.path.join(CraftSt=
andardDirs.craftRoot(), "lib")])
+        if CraftCore.compiler.isLinux:
+            self.prependEnvVar("LD_LIBRARY_PATH", [os.path.join(CraftStand=
ardDirs.craftRoot(), "lib"),
+                                                   os.path.join(CraftStand=
ardDirs.craftRoot(), "lib", "x86_64-linux-gnu")])
+        elif CraftCore.compiler.isMacOS:
+            self.prependEnvVar("DYLD_FRAMEWORK_PATH", [os.path.join(CraftS=
tandardDirs.craftRoot(), "lib")])
 =

     def _setupWin(self):
         if not "HOME" in os.environ:
[prev in list] [next in list] [prev in thread] [next in thread]