[Python-checkins] CVS: python/dist/src setup.py,1.38,1.38.2.1

Thomas Wouters twouters@users.sourceforge.net
Mon, 16 Jul 2001 09:00:36 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv27861

Modified Files:
      Tag: release21-maint
	setup.py 
Log Message:

Backport AMK's checkin 1.42:

Fix bug #437487: "2.1 build on Solaris fails if CC is set"
by adding the contents of CCSHARED to the compiler specified by CC



Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -r1.38 -r1.38.2.1
*** setup.py	2001/04/15 15:16:12	1.38
--- setup.py	2001/07/16 16:00:32	1.38.2.1
***************
*** 119,123 ****
          # compilers
          if compiler is not None:
!             args['compiler_so'] = compiler
          if linker_so is not None:
              args['linker_so'] = linker_so + ' -shared'
--- 119,124 ----
          # compilers
          if compiler is not None:
!             (ccshared,) = sysconfig.get_config_vars('CCSHARED')
!             args['compiler_so'] = compiler + ' ' + ccshared
          if linker_so is not None:
              args['linker_so'] = linker_so + ' -shared'