diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-03-28 00:41:06 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-03-28 00:41:06 +0000 |
| commit | 593515412848303aab50f6b55a928803dd64c18f (patch) | |
| tree | c1b937d300a12bc6cb25e43b9ce4cdf4e3e64e14 /include/makeinclude/wrapper_macros.GNU | |
| parent | 111874a20256a17d521f46c952e00051f50faa4e (diff) | |
| download | ATCD-593515412848303aab50f6b55a928803dd64c18f.tar.gz | |
ChangeLogTag: Wed Mar 27 18:36:14 2002 Krishnakumar B <kitty@cs.wustl.edu>
Diffstat (limited to 'include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index db15c23019a..328221a183e 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -278,20 +278,10 @@ endif ifeq ($(findstring g++,$(CXX)),g++) ifndef ACE_HAS_GNUG_PRE_2_8 - ifeq ($(filter g++,$(notdir $(CXX))),g++) ACE_HAS_GNUG_PRE_2_8 := \ $(shell \ - if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \ - echo 1; else echo 0; fi) - else # ! g++ - ifeq (eg++,$(filter g++,$(notdir $(CXX))),eg++) - # Assume that eg++ is egcs. - ACE_HAS_GNUG_PRE_2_8 := 0 - else # ! plain g++ or eg++ - # CXX is something like g++386. Assume, for now, that it's an old g++. - ACE_HAS_GNUG_PRE_2_8 := 1 - endif # ! plain g++ or eg++ - endif # ! g++ + if $(CXX) -dumpversion 2>/dev/null | egrep '^(cygnus-)?2\.[0-7]' \ + >/dev/null; then echo 1; else echo 0; fi) endif # ! ACE_HAS_GNUG_PRE_2_8 endif # g++ |