diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-29 06:17:04 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-29 06:17:04 (GMT) |
| commit | 095e32bfc511ee823af3752507c7211a305c8c00 (patch) | |
| tree | abed207a15f07cd102153e46d8d2050ef305e525 /Lib/distutils | |
| parent | 6a8e1ea80c2f2e8334b659f208fa3798219aebea (diff) | |
| parent | 4254e8c5484460b9be7e58dc89bd25815612fc37 (diff) | |
| download | cpython-095e32bfc511ee823af3752507c7211a305c8c00.zip cpython-095e32bfc511ee823af3752507c7211a305c8c00.tar.gz cpython-095e32bfc511ee823af3752507c7211a305c8c00.tar.bz2 | |
merge 3.5 (#1703178)
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 1 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 5e51ae4..74de782 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -166,6 +166,7 @@ class build_ext(Command): self.include_dirs.append(plat_py_include) self.ensure_string_list('libraries') + self.ensure_string_list('link_objects') # Life is easier if we're not forever checking for None, so # simplify these options to empty lists if unset diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 47b586c..6be0ca2 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -194,6 +194,13 @@ class BuildExtTestCase(TempdirManager, cmd.finalize_options() self.assertEqual(cmd.rpath, ['one', 'two']) + # make sure cmd.link_objects is turned into a list + # if it's a string + cmd = build_ext(dist) + cmd.link_objects = 'one two,three' + cmd.finalize_options() + self.assertEqual(cmd.link_objects, ['one', 'two', 'three']) + # XXX more tests to perform for win32 # make sure define is turned into 2-tuples |