Commit ed48d2d8 authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.27.x'

parents ed44d37a 9bf7db18
...@@ -229,6 +229,7 @@ def update_numpy_extension(ext): ...@@ -229,6 +229,7 @@ def update_numpy_extension(ext):
for attr, value in get_info('npymath').items(): for attr, value in get_info('npymath').items():
getattr(ext, attr).extend(value) getattr(ext, attr).extend(value)
def update_openmp_extension(ext): def update_openmp_extension(ext):
ext.openmp = True ext.openmp = True
language = ext.language language = ext.language
...@@ -248,6 +249,7 @@ def update_openmp_extension(ext): ...@@ -248,6 +249,7 @@ def update_openmp_extension(ext):
return EXCLUDE_EXT return EXCLUDE_EXT
def update_cpp11_extension(ext): def update_cpp11_extension(ext):
""" """
update cpp11 extensions that will run on versions of gcc >4.8 update cpp11 extensions that will run on versions of gcc >4.8
...@@ -256,7 +258,7 @@ def update_cpp11_extension(ext): ...@@ -256,7 +258,7 @@ def update_cpp11_extension(ext):
if gcc_version is not None: if gcc_version is not None:
compiler_version = gcc_version.group(1) compiler_version = gcc_version.group(1)
if float(compiler_version) > 4.8: if float(compiler_version) > 4.8:
ext.extra_compile_args.extend("-std=c++11") ext.extra_compile_args.append("-std=c++11")
return ext return ext
return EXCLUDE_EXT return EXCLUDE_EXT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment