diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-21 22:43:24 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-21 22:43:24 +0000 |
| commit | 1b2276da2110d08dfb38bf6f64000a293e1fe421 (patch) | |
| tree | 2547fd491d04980a0407e42fa48de5d98d172c25 /include/makeinclude/wrapper_macros.GNU | |
| parent | 993bea83732043d16f512b0423f3a0f3669c48f5 (diff) | |
| download | ATCD-1b2276da2110d08dfb38bf6f64000a293e1fe421.tar.gz | |
ChangeLogTag:Sat Apr 21 15:31:27 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 9d5e88d1548..bdbd1c912e8 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -279,13 +279,13 @@ endif ifeq ($(findstring g++,$(CXX)),g++) ifndef ACE_HAS_GNUG_PRE_2_8 - ifeq ($(notdir $(CXX)),g++) + 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++,$(notdir $(CXX)),eg++) + ifeq (eg++,$(filter g++,$(notdir $(CXX))),eg++) # Assume that eg++ is egcs. ACE_HAS_GNUG_PRE_2_8 := 0 else # ! plain g++ or eg++ @@ -568,7 +568,7 @@ ifdef shared_libs VDIR = .shobj/ ifeq ($(BIN),) #### No executables are being built, so don't create .obj/. - OBJDIRS = .shobj + OBJDIRS = $(VSHDIR) endif # BIN endif # ! VXWORKS endif # ! SHLIB |