|
8162
|
1 |
--- Python-2.4.2/Lib/distutils/sysconfig.py 2005-01-06 15:16:03.000000000 -0800
|
|
|
2 |
+++ Python-2.4.2-new/Lib/distutils/sysconfig.py 2006-08-24 05:33:41.133317000 -0700
|
|
|
3 |
@@ -149,16 +149,10 @@
|
|
|
4 |
(cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
|
|
|
5 |
get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
|
|
|
6 |
|
|
|
7 |
- if os.environ.has_key('CC'):
|
|
|
8 |
- cc = os.environ['CC']
|
|
|
9 |
- if os.environ.has_key('CXX'):
|
|
|
10 |
- cxx = os.environ['CXX']
|
|
|
11 |
- if os.environ.has_key('LDSHARED'):
|
|
|
12 |
- ldshared = os.environ['LDSHARED']
|
|
|
13 |
- if os.environ.has_key('CPP'):
|
|
|
14 |
- cpp = os.environ['CPP']
|
|
|
15 |
- else:
|
|
|
16 |
- cpp = cc + " -E" # not always
|
|
|
17 |
+ # On Solaris, we must always use pycc/pyCC, which will then look up
|
|
|
18 |
+ # $CC and $CXX
|
|
|
19 |
+ cpp = cc + " -E"
|
|
|
20 |
+
|
|
|
21 |
if os.environ.has_key('LDFLAGS'):
|
|
|
22 |
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
|
|
|
23 |
if basecflags:
|