From 32838fedb704da9ab0ab719d462290b13e2e4a7f Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Mon, 3 Nov 2003 18:20:36 +0000
Subject: Fixes for the AIX C and C++ Tool specifications.  (Vincent Risi)

---
 src/CHANGES.txt                 | 4 ++++
 src/engine/SCons/Tool/aixc++.py | 4 ++--
 src/engine/SCons/Tool/aixcc.py  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3edfdf9..c81e870 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -27,6 +27,10 @@ RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX -XXXX
 
   - Fix how the man page un-indents after examples in some browsers.
 
+  From Vincent Risi:
+
+  - Fix the C and C++ tool specifications for AIX.
+
 
 
 RELEASE 0.93 - Thu, 23 Oct 2003 07:26:55 -0500
diff --git a/src/engine/SCons/Tool/aixc++.py b/src/engine/SCons/Tool/aixc++.py
index 634b40e..5cb6639 100644
--- a/src/engine/SCons/Tool/aixc++.py
+++ b/src/engine/SCons/Tool/aixc++.py
@@ -34,8 +34,8 @@ def generate(env):
     suite to an Environment."""
     path, _cxx, _shcxx, version = get_xlc(env)
     if path:
-        _cxx = os.path.join(path, cxx)
-        _shcxx = os.path.join(path, shcxx)
+        _cxx = os.path.join(path, _cxx)
+        _shcxx = os.path.join(path, _shcxx)
 
     cplusplus.generate(env)
 
diff --git a/src/engine/SCons/Tool/aixcc.py b/src/engine/SCons/Tool/aixcc.py
index f4ff5a2..bf7a6b3 100644
--- a/src/engine/SCons/Tool/aixcc.py
+++ b/src/engine/SCons/Tool/aixcc.py
@@ -50,8 +50,8 @@ def generate(env):
     suite to an Environment."""
     path, _cc, _shcc, version = get_xlc(env)
     if path:
-        _cc = os.path.join(path, cc)
-        _shcc = os.path.join(path, shcc)
+        _cc = os.path.join(path, _cc)
+        _shcc = os.path.join(path, _shcc)
 
     cc.generate(env)
 
-- 
cgit v0.12