diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-09-06 21:24:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-09-06 21:24:35 (GMT) |
| commit | 238f5aa6a55e7b1193342453250955455998f0a4 (patch) | |
| tree | 4d27926fc3ab3348600705d6fd85079f8543578e /Lib/distutils/command | |
| parent | 87a2803eb4ba4592c7e497e8e06742690a6767ab (diff) | |
| parent | df0eb95b571321e6d47057f34b3afc3894476d3f (diff) | |
| download | cpython-238f5aa6a55e7b1193342453250955455998f0a4.zip cpython-238f5aa6a55e7b1193342453250955455998f0a4.tar.gz cpython-238f5aa6a55e7b1193342453250955455998f0a4.tar.bz2 | |
merge 3.4 (#22349)
Diffstat (limited to 'Lib/distutils/command')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 80689b6..3ab2d04 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -14,13 +14,7 @@ from distutils.extension import Extension from distutils.util import get_platform from distutils import log -# this keeps compatibility from 2.3 to 2.5 -if sys.version < "2.6": - USER_BASE = None - HAS_USER_SITE = False -else: - from site import USER_BASE - HAS_USER_SITE = True +from site import USER_BASE if os.name == 'nt': from distutils.msvccompiler import get_build_version @@ -97,14 +91,11 @@ class build_ext(Command): "list of SWIG command line options"), ('swig=', None, "path to the SWIG executable"), + ('user', None, + "add user include, library and rpath") ] - boolean_options = ['inplace', 'debug', 'force', 'swig-cpp'] - - if HAS_USER_SITE: - user_options.append(('user', None, - "add user include, library and rpath")) - boolean_options.append('user') + boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user'] help_options = [ ('help-compiler', None, |