From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Mon, 3 Nov 2003 18:20:36 +0000 (+0000)
Subject: Fixes for the AIX C and C++ Tool specifications.  (Vincent Risi)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a7bf95995121978eba83f3f86966a664b7e785b;p=scons.git

Fixes for the AIX C and C++ Tool specifications.  (Vincent Risi)


git-svn-id: http://scons.tigris.org/svn/scons/trunk@835 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3edfdf90..c81e8706 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 634b40ef..5cb6639f 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 f4ff5a29..bf7a6b3d 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)