equal
deleted
inserted
replaced
1 diff --git Python-2.6.4/Lib/distutils/sysconfig.py Python-2.6.4/Lib/distutils/sysconfig.py |
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 |
2 --- Python-2.6.4/Lib/distutils/sysconfig.py |
3 +++ Python-2.6.4/Lib/distutils/sysconfig.py |
3 +++ Python-2.6.4/Lib/distutils/sysconfig.py |
4 @@ -166,16 +166,10 @@ |
4 @@ -166,16 +166,12 @@ |
5 get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
5 get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
6 'CCSHARED', 'LDSHARED', 'SO') |
6 'CCSHARED', 'LDSHARED', 'SO') |
7 |
7 |
8 - if 'CC' in os.environ: |
8 - if 'CC' in os.environ: |
9 - cc = os.environ['CC'] |
9 - cc = os.environ['CC'] |
15 - cpp = os.environ['CPP'] |
15 - cpp = os.environ['CPP'] |
16 - else: |
16 - else: |
17 - cpp = cc + " -E" # not always |
17 - cpp = cc + " -E" # not always |
18 + # On Solaris, we must always use pycc/pyCC, which will then look up |
18 + # On Solaris, we must always use pycc/pyCC, which will then look up |
19 + # $CC and $CXX |
19 + # $CC and $CXX |
|
20 + cc = '/usr/lib/python2.6/pycc' |
|
21 + cxx = '/usr/lib/python2.6/pyCC' |
20 + cpp = cc + " -E" |
22 + cpp = cc + " -E" |
21 + |
23 + |
22 if 'LDFLAGS' in os.environ: |
24 if 'LDFLAGS' in os.environ: |
23 ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
25 ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
24 if 'CFLAGS' in os.environ: |
26 if 'CFLAGS' in os.environ: |