From 25358c0b394162db07fa5ca8d9731a5965c4e5b9 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Thu, 9 Jan 2003 21:57:03 +0000
Subject: [PATCH] Added "-Ae" flag to acc toolset. Added generic Unix cc
 toolset.

[SVN r16843]
---
 historic/jam/src/build.jam |  4 ++++
 historic/jam/src/build.sh  | 13 ++++++++++++-
 jam_src/build.jam          |  4 ++++
 jam_src/build.sh           | 13 ++++++++++++-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam
index 8d364450a..b6386b1fd 100644
--- a/historic/jam/src/build.jam
+++ b/historic/jam/src/build.jam
@@ -59,6 +59,10 @@ toolset acc cc : "-o " : -D
 toolset borland bcc32 : -e -n : /D
     : -WC -w- -q "-I$(toolset-root)Include" "-L$(toolset-root)Lib" -O2 -vi -w-inl
     : -WC -w- -q "-I$(toolset-root)Include" "-L$(toolset-root)Lib" -v -Od -vi- ;
+## Generic Unix cc
+toolset cc cc : "-o " : -D
+    : -s -O
+    : -g ;
 ## Comeau C/C++ 4.x
 toolset como como : "-o " : -D
     : --inlining
diff --git a/historic/jam/src/build.sh b/historic/jam/src/build.sh
index 00aab282a..53f169523 100644
--- a/historic/jam/src/build.sh
+++ b/historic/jam/src/build.sh
@@ -29,7 +29,12 @@ error_exit ()
     echo "### You can specify the toolset as the argument, i.e.:"
     echo "###     ./build.sh gcc"
     echo "###"
-    echo "### Toolsets supported by this script are: acc, como, darwin, gcc, intel-linux, kcc, kylix, mipspro, sunpro, tru64cxx, vacpp"
+    echo "### Toolsets supported by this script are:"
+    echo "###     acc, como, darwin, gcc, intel-linux, kcc, kylix, mipspro,"
+    echo "###     sunpro, tru64cxx, vacpp"
+    echo "### A special toolset; cc, is available which is used as a fallback"
+    echo "### when a more specific toolset is not available and the cc command"
+    echo "### detected."
     echo "###"
     exit 1
 }
@@ -62,6 +67,8 @@ Guess_Toolset ()
     elif test_path KCC ; then BOOST_JAM_TOOLSET=kcc
     elif test_path bc++ ; then BOOST_JAM_TOOLSET=kylix
     elif test_path aCC ; then BOOST_JAM_TOOLSET=acc
+    # Test for "cc" as the default fallback.
+    elif test_path cc ; then BOOST_JAM_TOOLSET=cc
     fi
     if test "$BOOST_JAM_TOOLSET" = "" ; then
         error_exit "Could not find a suitable toolset."
@@ -129,6 +136,10 @@ case $BOOST_JAM_TOOLSET in
     acc)
     BOOST_JAM_CC=cc
     ;;
+    
+    cc)
+    BOOST_JAM_CC=cc
+    ;;
    
     *)
     error_exit "Unknown toolset: $BOOST_JAM_TOOLSET"
diff --git a/jam_src/build.jam b/jam_src/build.jam
index 8d364450a..b6386b1fd 100644
--- a/jam_src/build.jam
+++ b/jam_src/build.jam
@@ -59,6 +59,10 @@ toolset acc cc : "-o " : -D
 toolset borland bcc32 : -e -n : /D
     : -WC -w- -q "-I$(toolset-root)Include" "-L$(toolset-root)Lib" -O2 -vi -w-inl
     : -WC -w- -q "-I$(toolset-root)Include" "-L$(toolset-root)Lib" -v -Od -vi- ;
+## Generic Unix cc
+toolset cc cc : "-o " : -D
+    : -s -O
+    : -g ;
 ## Comeau C/C++ 4.x
 toolset como como : "-o " : -D
     : --inlining
diff --git a/jam_src/build.sh b/jam_src/build.sh
index 00aab282a..53f169523 100644
--- a/jam_src/build.sh
+++ b/jam_src/build.sh
@@ -29,7 +29,12 @@ error_exit ()
     echo "### You can specify the toolset as the argument, i.e.:"
     echo "###     ./build.sh gcc"
     echo "###"
-    echo "### Toolsets supported by this script are: acc, como, darwin, gcc, intel-linux, kcc, kylix, mipspro, sunpro, tru64cxx, vacpp"
+    echo "### Toolsets supported by this script are:"
+    echo "###     acc, como, darwin, gcc, intel-linux, kcc, kylix, mipspro,"
+    echo "###     sunpro, tru64cxx, vacpp"
+    echo "### A special toolset; cc, is available which is used as a fallback"
+    echo "### when a more specific toolset is not available and the cc command"
+    echo "### detected."
     echo "###"
     exit 1
 }
@@ -62,6 +67,8 @@ Guess_Toolset ()
     elif test_path KCC ; then BOOST_JAM_TOOLSET=kcc
     elif test_path bc++ ; then BOOST_JAM_TOOLSET=kylix
     elif test_path aCC ; then BOOST_JAM_TOOLSET=acc
+    # Test for "cc" as the default fallback.
+    elif test_path cc ; then BOOST_JAM_TOOLSET=cc
     fi
     if test "$BOOST_JAM_TOOLSET" = "" ; then
         error_exit "Could not find a suitable toolset."
@@ -129,6 +136,10 @@ case $BOOST_JAM_TOOLSET in
     acc)
     BOOST_JAM_CC=cc
     ;;
+    
+    cc)
+    BOOST_JAM_CC=cc
+    ;;
    
     *)
     error_exit "Unknown toolset: $BOOST_JAM_TOOLSET"