This is an archive of the discontinued LLVM Phabricator instance.

Fix lldb executable discovery on OS X
ClosedPublic

Authored by vharron on May 18 2015, 10:37 PM.

Reviewers

Commits

Summary

It was broken by r237632

vharron retitled this revision from to Fix lldb executable discovery on OS X.

vharron updated this object.

vharron edited the test plan for this revision. (Show Details)

vharron added a reviewer: clayborg.

vharron added a subscriber: Unknown Object (MLST).

This revision was automatically updated to reflect the committed changes.

Path

Size

test/

2 lines

Show First 20 Lines • Show All 844 Lines • ▼ Show 20 Lines	def getOutputPaths(lldbRootDirectory):
"""		"""
Returns typical build output paths for the lldb executable		Returns typical build output paths for the lldb executable

lldbDirectory - path to the root of the lldb svn/git repo		lldbDirectory - path to the root of the lldb svn/git repo
"""		"""
result = []		result = []

if sys.platform == 'darwin':		if sys.platform == 'darwin':
result.append(getXcodeOutputPaths(lldbRootDirectory))		result.extend(getXcodeOutputPaths(lldbRootDirectory))

# cmake builds? look for build or build/host folder next to llvm directory		# cmake builds? look for build or build/host folder next to llvm directory
# lldb is located in llvm/tools/lldb so we need to go up three levels		# lldb is located in llvm/tools/lldb so we need to go up three levels
llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir))		llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir))
result.append(os.path.join(llvmParentDir, 'build', 'bin'))		result.append(os.path.join(llvmParentDir, 'build', 'bin'))
result.append(os.path.join(llvmParentDir, 'build', 'host', 'bin'))		result.append(os.path.join(llvmParentDir, 'build', 'host', 'bin'))

# some cmake developers keep their build directory beside their lldb directory		# some cmake developers keep their build directory beside their lldb directory
▲ Show 20 Lines • Show All 926 Lines • Show Last 20 Lines