diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 16:00:28 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 16:00:28 +0000 |
commit | 201ffc70192cf67a957b1e97a9dd26c59fb76ade (patch) | |
tree | 0c7bc8f38d4497d9e226f7b34e30ad20cefea383 /testtools/source | |
parent | ea8fa657e4e396281d01495aa26b087d974dd70d (diff) |
INTEGRATION: CWS cmcfixes43 (1.34.8); FILE MERGED
2008/03/03 10:54:31 cmc 1.34.8.1: #i86629 unify gcc maps
Diffstat (limited to 'testtools/source')
-rw-r--r-- | testtools/source/bridgetest/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 35419f289ae7..69b28e1a5e1b 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.35 $ +# $Revision: 1.36 $ # # This file is part of OpenOffice.org. # @@ -79,8 +79,8 @@ SHL1STDLIBS= \ SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" -SHL1VERSIONMAP = component.LINUXIgcc3.map +.IF "$(COMNAME)" == "gcc3" +SHL1VERSIONMAP = component.gcc3.map .ELSE SHL1VERSIONMAP = component.map .ENDIF @@ -102,8 +102,8 @@ SHL2STDLIBS= \ SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) -.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" -SHL2VERSIONMAP = component.LINUXIgcc3.map +.IF "$(COMNAME)" == "gcc3" +SHL2VERSIONMAP = component.gcc3.map .ELSE SHL2VERSIONMAP = component.map .ENDIF |