diff -r 51b9f966241b src/distutils2/compiler/ccompiler.py --- a/src/distutils2/compiler/ccompiler.py Sat Mar 20 16:51:46 2010 -0400 +++ b/src/distutils2/compiler/ccompiler.py Sat Apr 03 02:50:33 2010 +0200 @@ -28,10 +28,18 @@ varies across Unices and is stored in Python's Makefile. """ if compiler.compiler_type == "unix": - (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ - sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SO', 'AR', - 'ARFLAGS') + (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ + sysconfig.get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', + 'LDCXXSHARED', 'SO', 'AR', 'ARFLAGS') + + # For compatibility with older versions of Python + if cxx is None: + cxx = cc + if ldcxxshared is None: + ldcxxshared = ldshared + + cflags = '' + cxxflags = '' if 'CC' in os.environ: cc = os.environ['CC'] @@ -39,19 +47,27 @@ 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 = opt + ' ' + 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: @@ -65,13 +81,17 @@ archiver = ar + ' rc' 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_cxx_so=cxx_cmd + ' ' + ccshared, linker_so=ldshared, linker_exe=cc, + linker_so_cxx=ldcxxshared, + linker_exe_cxx=cxx, archiver=archiver) compiler.shared_lib_extension = so_ext diff -r 51b9f966241b src/distutils2/compiler/cygwinccompiler.py --- a/src/distutils2/compiler/cygwinccompiler.py Sat Mar 20 16:51:46 2010 -0400 +++ b/src/distutils2/compiler/cygwinccompiler.py Sat Apr 03 02:50:33 2010 +0200 @@ -139,9 +139,13 @@ self.set_executables(compiler='gcc -mcygwin -O -Wall', compiler_so='gcc -mcygwin -mdll -O -Wall', compiler_cxx='g++ -mcygwin -O -Wall', + compiler_cxx_so='g++ -mcygwin -mdll -O -Wall', linker_exe='gcc -mcygwin', linker_so=('%s -mcygwin %s' % - (self.linker_dll, shared_option))) + (self.linker_dll, shared_option)), + linker_exe_cxx='g++ -mcygwin', + linker_so_cxx=('%s -mcygwin %s' % + (self.linker_dll, shared_option))) # cygwin and mingw32 need different sets of libraries if self.gcc_version == "2.91.57": @@ -165,8 +169,12 @@ 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_cxx_so + cc_args + [src, '-o', obj] + + extra_postargs) + else: + self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + + extra_postargs) except DistutilsExecError, msg: raise CompileError, msg @@ -297,10 +305,15 @@ self.set_executables(compiler='gcc -mno-cygwin -O -Wall', compiler_so='gcc -mno-cygwin -mdll -O -Wall', compiler_cxx='g++ -mno-cygwin -O -Wall', + compiler_cxx_so='g++ -mno-cygwin -mdll -O -Wall', linker_exe='gcc -mno-cygwin', linker_so='%s -mno-cygwin %s %s' % (self.linker_dll, shared_option, - entry_point)) + entry_point), + linker_exe_cxx='g++ -mno-cygwin', + linker_so_cxx='%s -mno-cygwin %s %s' + % (self.linker_dll, shared_option, + entry_point)) # Maybe we should also append -mthreads, but then the finished # dlls need another dll (mingwm10.dll see Mingw32 docs) # (-mthreads: Support thread-safe exception handling on `Mingw32') diff -r 51b9f966241b src/distutils2/compiler/emxccompiler.py --- a/src/distutils2/compiler/emxccompiler.py Sat Mar 20 16:51:46 2010 -0400 +++ b/src/distutils2/compiler/emxccompiler.py Sat Apr 03 02:50:33 2010 +0200 @@ -66,8 +66,12 @@ # XXX optimization, warnings etc. should be customizable. self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + compiler_cxx_so='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', linker_exe='gcc -Zomf -Zmt -Zcrtdll', - linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') + linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', + linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', + linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') # want the gcc library statically linked (so that we don't have # to distribute a version dependent on the compiler we have) @@ -84,8 +88,12 @@ 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_cxx_so + cc_args + [src, '-o', obj] + + extra_postargs) + else: + self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + + extra_postargs) except DistutilsExecError, msg: raise CompileError, msg diff -r 51b9f966241b src/distutils2/compiler/unixccompiler.py --- a/src/distutils2/compiler/unixccompiler.py Sat Mar 20 16:51:46 2010 -0400 +++ b/src/distutils2/compiler/unixccompiler.py Sat Apr 03 02:50:33 2010 +0200 @@ -119,14 +119,17 @@ # are pretty generic; they will probably have to be set by an outsider # (eg. using information discovered by the sysconfig about building # Python extensions). - executables = {'preprocessor' : None, - 'compiler' : ["cc"], - 'compiler_so' : ["cc"], - 'compiler_cxx' : ["cc"], - 'linker_so' : ["cc", "-shared"], - 'linker_exe' : ["cc"], - 'archiver' : ["ar", "-cr"], - 'ranlib' : None, + executables = {'preprocessor' : None, + 'compiler' : ["cc"], + 'compiler_so' : ["cc"], + 'compiler_cxx' : ["c++"], + 'compiler_cxx_so' : ["c++"], + 'linker_so' : ["cc", "-shared"], + 'linker_exe' : ["cc"], + 'linker_so_cxx' : ["c++", "-shared"], + 'linker_exe_cxx' : ["c++"], + 'archiver' : ["ar", "-cr"], + 'ranlib' : None, } if sys.platform[:6] == "darwin": @@ -176,11 +179,18 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): compiler_so = self.compiler_so + compiler_cxx_so = self.compiler_cxx_so if sys.platform == 'darwin': compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs) + compiler_cxx_so = _darwin_compiler_fixup(compiler_cxx_so, 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_cxx_so + cc_args + [src, '-o', obj] + + extra_postargs) + else: + self.spawn(compiler_so + cc_args + [src, '-o', obj] + + extra_postargs) except DistutilsExecError, msg: raise CompileError, msg @@ -237,23 +247,16 @@ ld_args.extend(extra_postargs) self.mkpath(os.path.dirname(output_filename)) try: - if target_desc == CCompiler.EXECUTABLE: - linker = self.linker_exe[:] + if target_lang == "c++": + if target_desc == CCompiler.EXECUTABLE: + linker = self.linker_exe_cxx[:] + else: + linker = self.linker_so_cxx[:] else: - linker = self.linker_so[:] - if target_lang == "c++" and self.compiler_cxx: - # skip over environment variable settings if /usr/bin/env - # is used to set up the linker's environment. - # This is needed on OSX. Note: this assumes that the - # normal and C++ compiler have the same environment - # settings. - i = 0 - if os.path.basename(linker[0]) == "env": - i = 1 - while '=' in linker[i]: - i = i + 1 - - linker[i] = self.compiler_cxx[i] + if target_desc == CCompiler.EXECUTABLE: + linker = self.linker_exe[:] + else: + linker = self.linker_so[:] if sys.platform == 'darwin': linker = _darwin_compiler_fixup(linker, ld_args)