--- Source/setup_configure.py +++ Source/setup_configure.py @@ -821,8 +821,8 @@ def __init__( self, setup ): Compiler.__init__( self, setup ) - self._addVar( 'CCC', 'g++' ) - self._addVar( 'CC', 'gcc' ) + self._addVar( 'CCC', '$(CXX)' ) + self._addVar( 'CC', '$(CC)' ) def getPythonExtensionFileExt( self ): return '.so' @@ -864,7 +864,7 @@ rules.append( '%s : %s' % (target_filename, ' '.join( all_objects )) ) rules.append( '\t@echo Link %s' % (target_filename,) ) - rules.append( '\t@%%(LDSHARED)s -o %s %%(CCCFLAGS)s %s' % (target_filename, ' '.join( all_objects )) ) + rules.append( '\t@%%(LDSHARED)s -o %s %%(CCCFLAGS)s %s %%(LDLIBS)s' % (target_filename, ' '.join( all_objects )) ) self.makePrint( self.expand( '\n'.join( rules ) ) ) @@ -939,8 +939,8 @@ else: arch_options = '' - self._addVar( 'CCC', 'g++ %s' % (arch_options,) ) - self._addVar( 'CC', 'gcc %s' % (arch_options,) ) + self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) ) + self._addVar( 'CC', '$(CC) %s' % (arch_options,) ) self._find_paths_pycxx_dir = [ '../Import/pycxx-%d.%d.%d' % pycxx_version, @@ -1004,12 +1004,12 @@ def setupUtilities( self ): self._addVar( 'CCCFLAGS', - '-g ' + '$(CXXFLAGS) ' '-no-long-double ' '-Wall -fPIC -fexceptions -frtti ' '-I. -I%(APR_INC)s -I%(SVN_INC)s ' '-D%(DEBUG)s' ) - self._addVar( 'LDEXE', '%(CCC)s -g' ) + self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' ) def setupPySvn( self ): self._pysvnModuleSetup() @@ -1022,7 +1022,7 @@ self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) py_cflags_list = [ - '-g', + '$(CXXFLAGS)', '-no-long-double', '-Wall -fPIC -fexceptions -frtti', '-I. -I%(APR_INC)s -I%(SVN_INC)s', @@ -1049,13 +1049,12 @@ self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) ) - self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' + self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle ' '-framework System ' '%(PYTHON_FRAMEWORK)s ' '-framework CoreFoundation ' '-framework Kerberos ' - '-framework Security ' - '%(LDLIBS)s' ) + '-framework Security' ) class UnixCompilerGCC(CompilerGCC): def __init__( self, setup ): @@ -1115,11 +1114,11 @@ def setupUtilities( self ): self._addVar( 'CCCFLAGS', - '-g ' + '$(CXXFLAGS) ' '-Wall -fPIC -fexceptions -frtti ' '-I. -I%(APR_INC)s -I%(SVN_INC)s ' '-D%(DEBUG)s' ) - self._addVar( 'LDEXE', '%(CCC)s -g' ) + self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' ) def setupPySvn( self ): self._pysvnModuleSetup() @@ -1129,6 +1128,7 @@ self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) py_cflags_list = [ + '$(CXXFLAGS)', '-Wall -fPIC -fexceptions -frtti', '-I. -I%(APR_INC)s -I%(SVN_INC)s', '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s', @@ -1145,7 +1145,7 @@ self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) - self._addVar( 'LDSHARED', '%(CCC)s -shared -g %(LDLIBS)s' ) + self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' ) #-------------------------------------------------------------------------------- class LinuxCompilerGCC(UnixCompilerGCC):