summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-11-24 16:10:44 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-11-24 16:10:44 +0100
commit92dc1ab4c8116656998d88d05ecdf39b486985ef (patch)
tree96c7cd143df9dbccd8edea443398881d574f598e
parenta297f034210313dbf8ba6e47c94e795cac9c1481 (diff)
parentf67b7e1d9ebeba46cffe005003316c1f1eed9e1a (diff)
CWS-TOOLING: integrate CWS cmcfixes64
-rw-r--r--moz/makefile.mk4
-rw-r--r--nss/makefile.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 3722229bf74d..b28605f6a073 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -183,6 +183,10 @@ CXXFLAGS+=-m64
.ENDIF
.EXPORT : CXXFLAGS
.ENDIF # "$(COMNAME)"=="sunpro5"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
+CXXFLAGS:=-mminimal-toc
+.EXPORT : CXXFLAGS
+.ENDIF
.ENDIF
.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 4ddd2b39015f..26bc88c80146 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -58,7 +58,7 @@ BUILD_OPT=1
.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(CPU)"=="X"
+.IF "$(BUILD64)"=="1"
# force 64-bit buildmode
USE_64:=1
.EXPORT : USE_64