mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-24 15:16:41 +00:00
setup: fix site-dirs to find system installed twisted on mac.
zooko helped me unravel a build weirdness today. somehow the system installed twisted (/System/Library) was pulling in parts of the other twisted (/Library) which had been installed by easy_install, and exploding. getting rid of the latter helped, but it took this change to get the tahoe build to stop trying to rebuild twisted and instead use the one that was already installed. c.f. tkt #229
This commit is contained in:
parent
ed9873c2a9
commit
5882ce99f4
4
setup.py
4
setup.py
@ -300,6 +300,10 @@ class BuildTahoe(Command):
|
||||
if sys.platform == "linux2":
|
||||
# workaround for tahoe #229 / setuptools #17, on debian
|
||||
command.extend(["--site-dirs", "/var/lib/python-support/" + pyver])
|
||||
elif sys.platform == "darwin":
|
||||
# this probably only applies to leopard 10.5, possibly only 10.5.5
|
||||
sd = "/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python"
|
||||
command.extend(["--site-dirs", sd])
|
||||
print "Command:", " ".join(command)
|
||||
rc = subprocess.call(command)
|
||||
if rc < 0:
|
||||
|
Loading…
Reference in New Issue
Block a user