--- Python-2.5.1/Lib/distutils/sysconfig.py.pycc 2006-10-08 13:50:26.000000000 -0400

+++ Python-2.5.1/Lib/distutils/sysconfig.py 2007-08-08 20:47:51.288668000 -0400

@@ -150,16 +150,10 @@

get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',

'CCSHARED', 'LDSHARED', 'SO')

- if os.environ.has_key('CC'):

- cc = os.environ['CC']

- if os.environ.has_key('CXX'):

- cxx = os.environ['CXX']

- if os.environ.has_key('LDSHARED'):

- ldshared = os.environ['LDSHARED']

- if os.environ.has_key('CPP'):

- cpp = os.environ['CPP']

- else:

- cpp = cc + " -E" # not always

+ # On Solaris, we must always use pycc/pyCC, which will then look up

+ # $CC and $CXX

+ cpp = cc + " -E"

+

if os.environ.has_key('LDFLAGS'):

ldshared = ldshared + ' ' + os.environ['LDFLAGS']

if os.environ.has_key('CFLAGS'):