diff options
| author | Steven Knight <knight@baldmt.com> | 2003-10-26 01:50:45 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-10-26 01:50:45 (GMT) |
| commit | 6878482a572e1fb93bdf6a3d933193fe668a6978 (patch) | |
| tree | 7957d1b2adcfc517405fb75789573acec4d5f9e5 /src/script/sconsign.py | |
| parent | d1e65c3d358b857b1e53b90c0f4c940c7f95c6a5 (diff) | |
| download | SCons-6878482a572e1fb93bdf6a3d933193fe668a6978.zip SCons-6878482a572e1fb93bdf6a3d933193fe668a6978.tar.gz SCons-6878482a572e1fb93bdf6a3d933193fe668a6978.tar.bz2 | |
Fix a regression with CPPDEFINES when using the g++ Tool.
Diffstat (limited to 'src/script/sconsign.py')
| -rw-r--r-- | src/script/sconsign.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/script/sconsign.py b/src/script/sconsign.py index cc9e58d..015f1db 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -80,7 +80,6 @@ if sys.platform == 'win32': # sys.prefix is (likely) C:\Python*; # check only C:\Python*. prefs.append(sys.prefix) - prefs.append(os.path.join(sys.prefix, 'Lib', 'site-packages')) else: # On other (POSIX) platforms, things are more complicated due to # the variety of path names and library locations. Try to be smart @@ -122,13 +121,7 @@ else: # check only /foo/lib/scons*. prefs.append(sys.prefix) - temp = map(lambda x: os.path.join(x, 'lib'), prefs) - temp.extend(map(lambda x: os.path.join(x, - 'lib', - 'python' + sys.version[:3], - 'site-packages'), - prefs)) - prefs = temp + prefs = map(lambda x: os.path.join(x, 'lib'), prefs) # Look first for 'scons-__version__' in all of our preference libs, # then for 'scons'. |