summaryrefslogtreecommitdiffstats
path: root/cppu/util
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2007-11-06 14:03:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2007-11-06 14:03:41 +0000
commitac89d49e6b31c3c79ff56503a39af04a1164d505 (patch)
treeb1d85a071ffc2b62be006a4540409e702e1ac0ed /cppu/util
parentINTEGRATION: CWS cmcfixes38 (1.1.2); FILE ADDED (diff)
downloadcore-ac89d49e6b31c3c79ff56503a39af04a1164d505.tar.gz
core-ac89d49e6b31c3c79ff56503a39af04a1164d505.zip
INTEGRATION: CWS cmcfixes38 (1.12.6); FILE MERGED
2007/10/15 11:08:48 cmc 1.12.6.1: #i80735# merge 32bit and 64bit gcc maps, but let windows gcc do its own thing
Diffstat (limited to 'cppu/util')
-rw-r--r--cppu/util/makefile.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 08394c8ae48a..3ab29ad0c99a 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.14 $
+# $Revision: 1.15 $
#
-# last change: $Author: hr $ $Date: 2007-11-02 12:54:21 $
+# last change: $Author: rt $ $Date: 2007-11-06 15:03:41 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -83,11 +83,7 @@ DEF2NAME := $(SHL2TARGET)
.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
.ELSE
-.IF "$(CPUNAME)" == "X86_64"
-SHL2VERSIONMAP:=$(SHL2TARGET).$(CPUNAME).map
-.ELSE
SHL2VERSIONMAP:=$(SHL2TARGET).map
-.ENDIF # "$(CPUNAME)" == "X86_64"
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
SHL2DEF := $(MISC)$/$(SHL2TARGET).def
SHL2IMPLIB := i$(SHL2TARGET)