Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
cython
Commits
b306bc04
Commit
b306bc04
authored
Sep 16, 2018
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation failure with Pythran 0.8.7.
parent
81124d4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
Cython/Build/Dependencies.py
Cython/Build/Dependencies.py
+9
-5
No files found.
Cython/Build/Dependencies.py
View file @
b306bc04
...
@@ -35,9 +35,9 @@ except ImportError:
...
@@ -35,9 +35,9 @@ except ImportError:
try
:
try
:
import
pythran
import
pythran
import
pythran.config
import
pythran.config
PythranAvailable
=
True
pythran_version
=
pythran
.
__version__
except
:
except
:
PythranAvailable
=
Fals
e
pythran_version
=
Non
e
from
..
import
Utils
from
..
import
Utils
from
..Utils
import
(
cached_function
,
cached_method
,
path_exists
,
from
..Utils
import
(
cached_function
,
cached_method
,
path_exists
,
...
@@ -129,9 +129,13 @@ def file_hash(filename):
...
@@ -129,9 +129,13 @@ def file_hash(filename):
def
update_pythran_extension
(
ext
):
def
update_pythran_extension
(
ext
):
if
not
PythranAvailable
:
if
not
pythran_version
:
raise
RuntimeError
(
"You first need to install Pythran to use the np_pythran directive."
)
raise
RuntimeError
(
"You first need to install Pythran to use the np_pythran directive."
)
pythran_ext
=
pythran
.
config
.
make_extension
()
pythran_ext
=
(
pythran
.
config
.
make_extension
(
python
=
True
)
if
pythran_version
>=
'0.9'
or
pythran_version
>=
'0.8.7'
else
pythran
.
config
.
make_extension
()
)
ext
.
include_dirs
.
extend
(
pythran_ext
[
'include_dirs'
])
ext
.
include_dirs
.
extend
(
pythran_ext
[
'include_dirs'
])
ext
.
extra_compile_args
.
extend
(
pythran_ext
[
'extra_compile_args'
])
ext
.
extra_compile_args
.
extend
(
pythran_ext
[
'extra_compile_args'
])
ext
.
extra_link_args
.
extend
(
pythran_ext
[
'extra_link_args'
])
ext
.
extra_link_args
.
extend
(
pythran_ext
[
'extra_link_args'
])
...
@@ -936,7 +940,7 @@ def cythonize(module_list, exclude=None, nthreads=0, aliases=None, quiet=False,
...
@@ -936,7 +940,7 @@ def cythonize(module_list, exclude=None, nthreads=0, aliases=None, quiet=False,
safe_makedirs
(
options
[
'common_utility_include_dir'
])
safe_makedirs
(
options
[
'common_utility_include_dir'
])
pythran_options
=
None
pythran_options
=
None
if
PythranAvailable
:
if
pythran_version
:
pythran_options
=
CompilationOptions
(
**
options
)
pythran_options
=
CompilationOptions
(
**
options
)
pythran_options
.
cplus
=
True
pythran_options
.
cplus
=
True
pythran_options
.
np_pythran
=
True
pythran_options
.
np_pythran
=
True
...
...
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