diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/lang-specs.h | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bd03f2c..cf38d2d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Tue May 18 00:21:34 1999 Jeffrey A Law (law@cygnus.com) + + * lang-specs.h: Define __GNUC__ and __GNUC_MINOR__ only if -no-gcc + was not given. + 1999-05-17 Mark Mitchell <mark@codesourcery.com> * cp-tree.def (TEMPLATE_ID_EXPR): Update documentation. diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index 5f3d9f9..648bc1f 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -33,7 +33,8 @@ Boston, MA 02111-1307, USA. */ "%{E|M|MM:cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C++ does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ - -D__GNUC__=%v1 -D__GNUG__=%v1 -D__GNUC_MINOR__=%v2 -D__cplusplus\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUG__=%v1 -D__GNUC_MINOR__=%v2}\ + -D__cplusplus\ %{ansi:-trigraphs -D__STRICT_ANSI__} %{!undef:%{!ansi:%p} %P}\ %{!fno-exceptions:-D__EXCEPTIONS}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} %{trigraphs}\ @@ -43,8 +44,8 @@ Boston, MA 02111-1307, USA. */ %{!E:%{!M:%{!MM:cc1plus %i %1 %2\ -lang-c++ %{nostdinc*} %{C} %{A*} %{I*} %{P} %{$} %I\ %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ - -D__GNUC__=%v1 -D__GNUG__=%v1\ - -D__GNUC_MINOR__=%v2 -D__cplusplus\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUG__=%v1\ + -D__GNUC_MINOR__=%v2} -D__cplusplus\ %{ansi:-trigraphs -D__STRICT_ANSI__} %{!undef:%{!ansi:%p} %P}\ %{!fno-exceptions:-D__EXCEPTIONS}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -64,7 +65,8 @@ Boston, MA 02111-1307, USA. */ {"cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C++ does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ - -D__GNUC__=%v1 -D__GNUG__=%v1 -D__GNUC_MINOR__=%v2 -D__cplusplus\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUG__=%v1 -D__GNUC_MINOR__=%v2}\ + -D__cplusplus\ %{ansi:-trigraphs -D__STRICT_ANSI__} %{!undef:%{!ansi:%p} %P}\ %{!fno-exceptions:-D__EXCEPTIONS}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} %{trigraphs}\ |