Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
998b105c
Commit
998b105c
authored
Oct 23, 2012
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Plain Diff
Closes #16116: Merged fix from 3.3.
parents
d2e90cd6
e87acc1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
Lib/distutils/command/build_ext.py
Lib/distutils/command/build_ext.py
+7
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/distutils/command/build_ext.py
View file @
998b105c
...
...
@@ -160,6 +160,11 @@ class build_ext(Command):
if
isinstance
(
self
.
include_dirs
,
str
):
self
.
include_dirs
=
self
.
include_dirs
.
split
(
os
.
pathsep
)
# If in a virtualenv, add its include directory
# Issue 16116
if
sys
.
exec_prefix
!=
sys
.
base_exec_prefix
:
self
.
include_dirs
.
append
(
os
.
path
.
join
(
sys
.
exec_prefix
,
'include'
))
# Put the Python "system" include dir at the end, so that
# any local include dirs take precedence.
self
.
include_dirs
.
append
(
py_include
)
...
...
@@ -190,6 +195,8 @@ class build_ext(Command):
# must be the *native* platform. But we don't really support
# cross-compiling via a binary install anyway, so we let it go.
self
.
library_dirs
.
append
(
os
.
path
.
join
(
sys
.
exec_prefix
,
'libs'
))
if
sys
.
base_exec_prefix
!=
sys
.
prefix
:
# Issue 16116
self
.
library_dirs
.
append
(
os
.
path
.
join
(
sys
.
base_exec_prefix
,
'libs'
))
if
self
.
debug
:
self
.
build_temp
=
os
.
path
.
join
(
self
.
build_temp
,
"Debug"
)
else
:
...
...
Misc/NEWS
View file @
998b105c
...
...
@@ -59,6 +59,9 @@ Core and Builtins
Library
-------
-
Issue
#
16116
:
Fix
include
and
library
paths
to
be
correctwhen
building
C
extensions
in
venvs
.
-
Issue
#
16245
:
Fix
the
value
of
a
few
entities
in
html
.
entities
.
html5
.
-
Issue
#
16301
:
Fix
the
localhost
verification
in
urllib
/
request
.
py
for
file
://
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment