diff options
| author | Steven Knight <knight@baldmt.com> | 2006-02-14 05:27:04 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-02-14 05:27:04 (GMT) |
| commit | e7190df6b6aa89dac0370dc01ae45ff39254c221 (patch) | |
| tree | 3a95657ab680d4288110e8f1046b0d033997bd5f /src | |
| parent | 9655a1b459e6bb81ba44539d54e20d05b515b495 (diff) | |
| download | SCons-e7190df6b6aa89dac0370dc01ae45ff39254c221.zip SCons-e7190df6b6aa89dac0370dc01ae45ff39254c221.tar.gz SCons-e7190df6b6aa89dac0370dc01ae45ff39254c221.tar.bz2 | |
Portability fixes for Repository Java tests; eliminate Solaris package warnings when searching for C++. (Baptiste Lepilleur)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/sunc++.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 2e24314..70e19d4 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -144,8 +144,9 @@ RELEASE 0.97 - XXX - Add support for Visual Studio 2005 Pro. - - Fix Windows portability issues in various Visual Studio and - Java tests. + - Fix portability issues in various Visual Studio and Java tests. + + - Ignore pkgchk errors on Solaris when searching for the C++ compiler. From Christian Maaser: diff --git a/src/engine/SCons/Tool/sunc++.py b/src/engine/SCons/Tool/sunc++.py index a6ac10a..36316cb 100644 --- a/src/engine/SCons/Tool/sunc++.py +++ b/src/engine/SCons/Tool/sunc++.py @@ -53,7 +53,7 @@ def get_cppc(env): line = os.popen(cmd).readline() if line: cppcVersion = line.split()[-1] - cmd = "%s -l %s | grep '^Pathname:.*/bin/CC$' | grep -v '/SC[0-9]*\.[0-9]*/'" % (pkgchk, package) + cmd = "%s -l %s 2>/dev/null | grep '^Pathname:.*/bin/CC$' | grep -v '/SC[0-9]*\.[0-9]*/'" % (pkgchk, package) line = os.popen(cmd).readline() cppcPath = os.path.dirname(line.split()[-1]) break |