summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-08 15:23:57 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-08 15:23:57 (GMT)
commitdac6aeb43c5be6b0ad506bb03234d0596853df31 (patch)
treec482a3d92bfd614b5d44989de3d804cfb78f3550 /Lib
parent8851b71c6f47f3d4b4c723118d9600e56421dad7 (diff)
downloadcpython-dac6aeb43c5be6b0ad506bb03234d0596853df31.zip
cpython-dac6aeb43c5be6b0ad506bb03234d0596853df31.tar.gz
cpython-dac6aeb43c5be6b0ad506bb03234d0596853df31.tar.bz2
Revert r80963 - it broke compilation everywhere
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/unixccompiler.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index ba831f7..783d4dc 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -15,7 +15,7 @@ the "typical" Unix-style command-line C compiler:
__revision__ = "$Id$"
-import os, sys, re
+import os, sys
from types import StringType, NoneType
from distutils import sysconfig
@@ -305,29 +305,10 @@ class UnixCCompiler(CCompiler):
dylib_f = self.library_filename(lib, lib_type='dylib')
static_f = self.library_filename(lib, lib_type='static')
- if sys.platform == 'darwin':
- # On OSX users can specify an alternate SDK using
- # '-isysroot', calculate the SDK root if it is specified
- # (and use it further on)
- cflags = sysconfig.get_config_var('CFLAGS')
- m = re.search(r'-isysroot\s+(\S+)', cflags)
- if m is None:
- sysroot = '/'
- else:
- sysroot = m.group(1)
-
-
-
for dir in dirs:
shared = os.path.join(dir, shared_f)
dylib = os.path.join(dir, dylib_f)
static = os.path.join(dir, static_f)
-
- if sys.platform == 'darwin' and (dir.startswith('/System/') or dir.startswith('/usr/')):
- shared = os.path.join(sysroot, dir[1:], shared_f)
- dylib = os.path.join(sysroot, dir[1:], dylib_f)
- static = os.path.join(sysroot, dir[1:], static_f)
-
# We're second-guessing the linker here, with not much hard
# data to go on: GCC seems to prefer the shared library, so I'm
# assuming that *all* Unix C compilers do. And of course I'm