fixed #1520877: now distutils reads Read from the environment/Makefile
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index ec2f8a9..deb51a1 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -165,9 +165,9 @@
varies across Unices and is stored in Python's Makefile.
"""
if compiler.compiler_type == "unix":
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+ (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar) = \
get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO')
+ 'CCSHARED', 'LDSHARED', 'SO', 'AR')
if 'CC' in os.environ:
cc = os.environ['CC']
@@ -188,6 +188,8 @@
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ if 'AR' in os.environ:
+ ar = os.environ['AR']
cc_cmd = cc + ' ' + cflags
compiler.set_executables(
@@ -196,7 +198,8 @@
compiler_so=cc_cmd + ' ' + ccshared,
compiler_cxx=cxx,
linker_so=ldshared,
- linker_exe=cc)
+ linker_exe=cc,
+ archiver=ar)
compiler.shared_lib_extension = so_ext
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index 397bb12..7f0bce6 100644
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -8,6 +8,13 @@
class SysconfigTestCase(unittest.TestCase):
+ def setUp(self):
+ self.old_AR = os.environ.get('AR')
+
+ def tearDown(self):
+ if self.old_AR is not None:
+ os.environ['AR'] = self.old_AR
+
def test_get_config_h_filename(self):
config_h = sysconfig.get_config_h_filename()
self.assert_(os.path.isfile(config_h), config_h)
@@ -32,6 +39,21 @@
self.assert_(isinstance(cvars, dict))
self.assert_(cvars)
+ def test_customize_compiler(self):
+
+ os.environ['AR'] = 'xxx'
+
+ # make sure AR gets caught
+ class compiler:
+ compiler_type = 'unix'
+
+ def set_executables(self, **kw):
+ self.exes = kw
+
+ comp = compiler()
+ sysconfig.customize_compiler(comp)
+ self.assertEquals(comp.exes['archiver'], 'xxx')
+
def test_suite():
suite = unittest.TestSuite()
diff --git a/Misc/NEWS b/Misc/NEWS
index 6ec1269..c843257 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -149,6 +149,9 @@
Library
-------
+- Issue #1520877: Now distutils.sysconfig reads $AR from the
+ environment/Makefile. Patch by Douglas Greiman.
+
- Issue #4285: Change sys.version_info to be a named tuple. Patch by
Ross Light.