From cf7aedcd6896cb6dd454eec14fb9fabeda71662d Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Tue, 22 Jul 2003 16:40:27 +0000
Subject: [PATCH] Patch from Christopher Currie, changes building with sunpro
 tools to use the C compiler instead of the C++ compiler.

[SVN r19263]
---
 src/engine/build.jam | 6 +++---
 src/engine/build.sh  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/engine/build.jam b/src/engine/build.jam
index 3c6a2d2d1..52e273434 100644
--- a/src/engine/build.jam
+++ b/src/engine/build.jam
@@ -141,10 +141,10 @@ toolset msvc cl : /Fe : -D
     [ opt --debug : /MLd /DEBUG /Z7 /Od /Ob0 ]
     : kernel32.lib ;
 ## Sun Workshop 6 C++
-toolset sunpro CC : "-o " : -D
+toolset sunpro cc : "-o " : -D
     :
-    [ opt --release : -s -fast -O4 ]
-    [ opt --debug : -g +d ] ;
+    [ opt --release : -s -fast -xO4 ]
+    [ opt --debug : -g ] ;
 ## Compaq Alpha CXX
 toolset tru64cxx cc : "-o " : -D
     :
diff --git a/src/engine/build.sh b/src/engine/build.sh
index c4231bfb9..2091c48f7 100755
--- a/src/engine/build.sh
+++ b/src/engine/build.sh
@@ -80,7 +80,7 @@ Guess_Toolset ()
     elif test_path bc++ ; then BOOST_JAM_TOOLSET=kylix
     elif test_path aCC ; then BOOST_JAM_TOOLSET=acc
     elif test_uname HP-UX ; then BOOST_JAM_TOOLSET=acc
-    elif test -r /opt/SUNWspro/bin/CC ; then
+    elif test -r /opt/SUNWspro/bin/cc ; then
         BOOST_JAM_TOOLSET=sunpro
         BOOST_JAM_TOOLSET_ROOT=/opt/SUNWspro/
     # Test for "cc" as the default fallback.
@@ -149,13 +149,13 @@ case $BOOST_JAM_TOOLSET in
     ;;
     
     sunpro)
-    if test -r /opt/SUNWspro/bin/CC ; then
+    if test -r /opt/SUNWspro/bin/cc ; then
         BOOST_JAM_TOOLSET_ROOT=/opt/SUNWspro/
     fi
-    if test -r $BOOST_JAM_TOOLSET_ROOTbin/CC ; then
+    if test -r $BOOST_JAM_TOOLSET_ROOTbin/cc ; then
         export PATH=$BOOST_JAM_TOOLSET_ROOTbin:$PATH
     fi
-    BOOST_JAM_CC=CC
+    BOOST_JAM_CC=cc
     ;;
     
     tru64cxx)