diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-12 17:21:24 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-12 17:21:24 -0700 |
| commit | 70343bf47d558dbfc26fc872de0504be3b2f33fe (patch) | |
| tree | 457748087a8210e59c2f9322e97e7009c83d4087 | |
| parent | 6408dc82fabf5bbbc8b7ed7287e34b4e0080191d (diff) | |
| parent | f07422c0258d0ba6e3887f71f7d726bcde9adb35 (diff) | |
| download | cpython-git-70343bf47d558dbfc26fc872de0504be3b2f33fe.tar.gz | |
merge 3.5 (#25076)
| -rw-r--r-- | Doc/distutils/apiref.rst | 2 | ||||
| -rw-r--r-- | Lib/distutils/ccompiler.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index d0f89471f8..35aa114984 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -521,7 +521,7 @@ This module provides the following functions. .. method:: CCompiler.library_option(lib) - Return the compiler option to add *dir* to the list of libraries linked into the + Return the compiler option to add *lib* to the list of libraries linked into the shared library or executable. diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py index b7df394ecc..82fd7d5c4d 100644 --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -752,7 +752,7 @@ class CCompiler: raise NotImplementedError def library_option(self, lib): - """Return the compiler option to add 'dir' to the list of libraries + """Return the compiler option to add 'lib' to the list of libraries linked into the shared library or executable. """ raise NotImplementedError |