changeset:   104155:eac20127d51e
branch:      3.6
parent:      104151:04060fa4428d
parent:      104154:b2f0a31fa441
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Sep 28 23:17:04 2016 -0700
files:       Lib/distutils/command/build_ext.py Lib/distutils/tests/test_build_ext.py Misc/NEWS
description:
merge 3.5 (#1703178)


diff -r 04060fa4428d -r eac20127d51e Lib/distutils/command/build_ext.py
--- a/Lib/distutils/command/build_ext.py	Thu Sep 29 04:40:56 2016 +0000
+++ b/Lib/distutils/command/build_ext.py	Wed Sep 28 23:17:04 2016 -0700
@@ -166,6 +166,7 @@
             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 -r 04060fa4428d -r eac20127d51e Lib/distutils/tests/test_build_ext.py
--- a/Lib/distutils/tests/test_build_ext.py	Thu Sep 29 04:40:56 2016 +0000
+++ b/Lib/distutils/tests/test_build_ext.py	Wed Sep 28 23:17:04 2016 -0700
@@ -194,6 +194,13 @@
         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
diff -r 04060fa4428d -r eac20127d51e Misc/NEWS
--- a/Misc/NEWS	Thu Sep 29 04:40:56 2016 +0000
+++ b/Misc/NEWS	Wed Sep 28 23:17:04 2016 -0700
@@ -350,6 +350,9 @@
   pickling and text representation purposes. Patch by Emanuel Barry and
   Serhiy Storchaka.
 
+- Issue #1703178: Fix the ability to pass the --link-objects option to the
+  distutils build_ext command.
+
 - Issue #28019: itertools.count() no longer rounds non-integer step in range
   between 1.0 and 2.0 to 1.