3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-19 17:37:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

[no-issue]

Browse source 
revert to r2421
This commit is contained in:
jerry 2014-09-15 15:17:07 +00:00
parent 1805dd7900
commit 7e562273d5
6 changed files with 38 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/toolchain/commands1.py
View file

@ -554,25 +554,7 @@ class InternalCommands:
return (major, minor, rev)
def getMacSdkDir(self):
# patch by Jake Petroules for issue 575
sdkName = "macosx" + self.macSdk
# Ideally we'll use xcrun (which is influenced by $DEVELOPER_DIR), then try a couple
# fallbacks to known paths if xcrun is not available
sdkPath = commands.getoutput("xcrun --show-sdk-path --sdk " + sdkName)
if sdkPath:
return sdkPath
developerDir = os.getenv("DEVELOPER_DIR")
if not developerDir:
developerDir = "/Applications/Xcode.app/Contents/Developer"
sdkDirName = sdkName.replace("macosx", "MacOSX")
sdkPath = developerDir + "/Platforms/MacOSX.platform/Developer/SDKs/" + sdkDirName + ".sdk"
if os.path.exists(sdkPath):
return sdkPath
return "/Developer/SDKs/" + sdkDirName + ".sdk"
return "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk"
# http://tinyurl.com/cs2rxxb
def fixCmakeEclipseBug(self):