summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-03-04 21:30:12 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-03-04 21:30:12 (GMT)
commitcea1ddb4aa6ccae552ff9838cb07c6802785b8fc (patch)
treea00213363009e33a243bac4081ff7c70c3f812f2
parenteeafb96b0877b78b1efd341f1103b2a81d5116e1 (diff)
downloadcpython-cea1ddb4aa6ccae552ff9838cb07c6802785b8fc.zip
cpython-cea1ddb4aa6ccae552ff9838cb07c6802785b8fc.tar.gz
cpython-cea1ddb4aa6ccae552ff9838cb07c6802785b8fc.tar.bz2
Change framework search order when looking for Tcl/Tk on OSX.
This is needed because the system linker looks in /Library/Framework before it looks in /System/Library frameworks. Without this patch _tkinter will be unusable when it is compiled on a system that has Tk 8.5 installed in /Library/Frameworks (and the Apple 8.4 install in /System/Library/Frameworks)
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 985779d..f1e983d 100644
--- a/setup.py
+++ b/setup.py
@@ -1443,8 +1443,8 @@ class PyBuildExt(build_ext):
# different the UNIX search logic is not sharable.
from os.path import join, exists
framework_dirs = [
- '/System/Library/Frameworks/',
'/Library/Frameworks',
+ '/System/Library/Frameworks/',
join(os.getenv('HOME'), '/Library/Frameworks')
]