components/python/python26/patches/Python26-03-distutils-pycc.patch
changeset 4984 7145b15b7f0d
parent 4983 db2589571faa
child 4985 eed3576cafd0
equal deleted inserted replaced
4983:db2589571faa 4984:7145b15b7f0d
     1 diff --git Python-2.6.4/Lib/distutils/sysconfig.py Python-2.6.4/Lib/distutils/sysconfig.py
       
     2 --- Python-2.6.4/Lib/distutils/sysconfig.py
       
     3 +++ Python-2.6.4/Lib/distutils/sysconfig.py
       
     4 @@ -166,16 +166,12 @@
       
     5              get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
       
     6                              'CCSHARED', 'LDSHARED', 'SO')
       
     7  
       
     8 -        if 'CC' in os.environ:
       
     9 -            cc = os.environ['CC']
       
    10 -        if 'CXX' in os.environ:
       
    11 -            cxx = os.environ['CXX']
       
    12 -        if 'LDSHARED' in os.environ:
       
    13 -            ldshared = os.environ['LDSHARED']
       
    14 -        if 'CPP' in os.environ:
       
    15 -            cpp = os.environ['CPP']
       
    16 -        else:
       
    17 -            cpp = cc + " -E"           # not always
       
    18 +        # On Solaris, we must always use pycc/pyCC, which will then look up
       
    19 +        # $CC and $CXX
       
    20 +        cc = '/usr/lib/python2.6/pycc'
       
    21 +        cxx = '/usr/lib/python2.6/pyCC'
       
    22 +        cpp = cc + " -E"
       
    23 +
       
    24          if 'LDFLAGS' in os.environ:
       
    25              ldshared = ldshared + ' ' + os.environ['LDFLAGS']
       
    26          if 'CFLAGS' in os.environ: