Skip to content

Commit

Permalink
Merge pull request #221 from sciyoshi/distutils-cpp
Browse files Browse the repository at this point in the history 
Distutils C++ support
  • Loading branch information
@jaraco
jaraco authored Feb 13, 2024
2 parents 06d5663 + c90a28d commit d70e4da
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 8 deletions.
17 changes: 14 additions & 3 deletions distutils/cygwinccompiler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,19 @@ def __init__(self, verbose=0, dry_run=0, force=0):
self.cxx = os.environ.get('CXX', 'g++')

self.linker_dll = self.cc
self.linker_dll_cxx = self.cxx
shared_option = "-shared"

self.set_executables(
compiler='%s -mcygwin -O -Wall' % self.cc,
compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx,
linker_exe='%s -mcygwin' % self.cc,
linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)),
linker_exe_cxx='%s -mcygwin' % self.cxx,
linker_so_cxx=('%s -mcygwin %s' %
(self.linker_dll_cxx, shared_option)),
)

# Include the appropriate MSVC runtime library if Python was built
Expand Down Expand Up @@ -140,9 +145,12 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
raise CompileError(msg)
else: # for other files use the C-compiler
try:
self.spawn(
self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs
)
if self.detect_language(src) == 'c++':
self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
extra_postargs)
else:
self.spawn(
self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)

Expand Down Expand Up @@ -278,9 +286,12 @@ def __init__(self, verbose=0, dry_run=0, force=0):
self.set_executables(
compiler='%s -O -Wall' % self.cc,
compiler_so='%s -mdll -O -Wall' % self.cc,
compiler_so_cxx='%s -mdll -O -Wall' % self.cxx,
compiler_cxx='%s -O -Wall' % self.cxx,
linker_exe='%s' % self.cc,
linker_so='{} {}'.format(self.linker_dll, shared_option),
linker_exe_cxx='%s' % self.cxx,
linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option)
)

def runtime_library_dir_option(self, dir):
Expand Down
20 changes: 18 additions & 2 deletions distutils/sysconfig.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ def customize_compiler(compiler): # noqa: C901
cflags,
ccshared,
ldshared,
ldcxxshared,
shlib_suffix,
ar,
ar_flags,
Expand All @@ -305,11 +306,14 @@ def customize_compiler(compiler): # noqa: C901
'CFLAGS',
'CCSHARED',
'LDSHARED',
'LDCXXSHARED',
'SHLIB_SUFFIX',
'AR',
'ARFLAGS',
)

cxxflags = cflags

if 'CC' in os.environ:
newcc = os.environ['CC']
if 'LDSHARED' not in os.environ and ldshared.startswith(cc):
Expand All @@ -321,19 +325,27 @@ def customize_compiler(compiler): # noqa: C901
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
if 'LDCXXSHARED' in os.environ:
ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
cflags = cflags + ' ' + os.environ['CFLAGS']
cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
if 'CXXFLAGS' in os.environ:
cxxflags = os.environ['CXXFLAGS']
ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
Expand All @@ -342,13 +354,17 @@ def customize_compiler(compiler): # noqa: C901
archiver = ar + ' ' + ar_flags

cc_cmd = cc + ' ' + cflags
cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
compiler_cxx=cxx,
compiler_cxx=cxx_cmd,
compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_so_cxx=ldcxxshared,
linker_exe=cc,
linker_exe_cxx=cxx,
archiver=archiver,
)

Expand Down
15 changes: 12 additions & 3 deletions distutils/unixccompiler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@ class UnixCCompiler(CCompiler):
'preprocessor': None,
'compiler': ["cc"],
'compiler_so': ["cc"],
'compiler_cxx': ["cc"],
'compiler_cxx': ["c++"],
'compiler_so_cxx': ["c++"],
'linker_so': ["cc", "-shared"],
'linker_so_cxx': ["c++", "-shared"],
'linker_exe': ["cc"],
'linker_exe_cxx': ["c++", "-shared"],
'archiver': ["ar", "-cr"],
'ranlib': None,
}
Expand Down Expand Up @@ -181,8 +184,13 @@ def preprocess(

def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs)
try:
self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
if self.detect_language(src) == 'c++':
self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] +
extra_postargs)
else:
self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)

Expand Down Expand Up @@ -250,7 +258,8 @@ def link(
# building an executable or linker_so (with shared options)
# when building a shared library.
building_exe = target_desc == CCompiler.EXECUTABLE
linker = (self.linker_exe if building_exe else self.linker_so)[:]
linker = (self.linker_exe if building_exe else (self.linker_so_cxx if
target_lang == "c++" else self.linker_so))[:]

if target_lang == "c++" and self.compiler_cxx:
env, linker_ne = _split_env(linker)
Expand Down

0 comments on commit d70e4da

Please sign in to comment.