equal
deleted
inserted
replaced
|
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,10 @@ |
|
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 + cpp = cc + " -E" |
|
21 + |
|
22 if 'LDFLAGS' in os.environ: |
|
23 ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
|
24 if 'CFLAGS' in os.environ: |