summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-09-20 10:37:33 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-09-20 10:37:33 (GMT)
commit40617a8eae014941aa6af779d6be0b8d36e1db2c (patch)
tree7b3ab960a53af8907e875b35e9e5936563bbb74e /setup.py
parent04606fbcbe2af419a2ab59ff0ba75b4fa994cfe1 (diff)
downloadcpython-40617a8eae014941aa6af779d6be0b8d36e1db2c.zip
cpython-40617a8eae014941aa6af779d6be0b8d36e1db2c.tar.gz
cpython-40617a8eae014941aa6af779d6be0b8d36e1db2c.tar.bz2
Merged revisions 74962 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74962 | ronald.oussoren | 2009-09-20 12:31:22 +0200 (Sun, 20 Sep 2009) | 2 lines Fix for issue 6851: urllib.urlopen crashes in a thread on OSX 10.6 ........
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 38b24e7..d716589 100644
--- a/setup.py
+++ b/setup.py
@@ -1402,6 +1402,17 @@ class PyBuildExt(build_ext):
addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
addMacExtension('autoGIL', core_kwds)
+ # _scproxy
+ sc_kwds = {
+ 'extra_compile_args': carbon_extra_compile_args,
+ 'extra_link_args': [
+ '-framework', 'SystemConfiguration',
+ '-framework', 'CoreFoundation'
+ ],
+ }
+ addMacExtension("_scproxy", sc_kwds)
+
+
# Carbon
carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
'extra_link_args': ['-framework', 'Carbon'],