Skip to content

Attempt to ensure that all C++ files build as C++11 #8208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gmarkall wants to merge 1 commit into from
Closed

Attempt to ensure that all C++ files build as C++11 #8208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Attempt to ensure that all C++ files build as C++11
  • Loading branch information
@gmarkall
gmarkall committed Jun 29, 2022
commit dce4525950dfd9ae79914ecd9d4db4f7b18ce3b3
12 changes: 6 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ def run(self):

super().run()

def build_extensions(self):
if not sys.platform.startswith('win'):
self.compiler.compiler_cxx.append('-std=c++11')
super().build_extensions()


cmdclass['build_ext'] = NumbaBuildExt

Expand Down Expand Up @@ -148,7 +153,6 @@ def get_ext_modules():
depends=['numba/_pymodule.h',
'numba/_devicearray.h'],
include_dirs=['numba'],
extra_compile_args=['-std=c++11'],
)

ext_dynfunc = Extension(name='numba._dynfunc',
Expand Down Expand Up @@ -235,11 +239,9 @@ def check_file_at_path(path2file):
# Set various flags for use in TBB and openmp. On OSX, also find OpenMP!
have_openmp = True
if sys.platform.startswith('win'):
cpp11flags = []
ompcompileflags = ['-openmp']
omplinkflags = []
elif sys.platform.startswith('darwin'):
cpp11flags = ['-std=c++11']
# This is a bit unusual but necessary...
# llvm (clang) OpenMP is used for headers etc at compile time
# Intel OpenMP (libiomp5) provides the link library.
Expand All @@ -251,7 +253,6 @@ def check_file_at_path(path2file):
omppath = ['lib', 'clang', '*', 'include', 'omp.h']
have_openmp = check_file_at_path(omppath)
else:
cpp11flags = ['-std=c++11']
ompcompileflags = ['-fopenmp']
if platform.machine() == 'ppc64le':
omplinkflags = ['-fopenmp']
Expand All @@ -277,7 +278,6 @@ def check_file_at_path(path2file):
],
depends=['numba/np/ufunc/workqueue.h'],
include_dirs=[os.path.join(tbb_root, 'include')],
extra_compile_args=cpp11flags,
libraries=['tbb'], # TODO: if --debug or -g, use 'tbb_debug'
library_dirs=[
# for Linux
Expand Down Expand Up @@ -305,7 +305,7 @@ def check_file_at_path(path2file):
'numba/np/ufunc/gufunc_scheduler.cpp',
],
depends=['numba/np/ufunc/workqueue.h'],
extra_compile_args=ompcompileflags + cpp11flags,
extra_compile_args=ompcompileflags,
extra_link_args=omplinkflags,
)

Expand Down