summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hyphen/makefile.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index e5748b71ae5c..ad3436a6eeef 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
# This file is part of OpenOffice.org.
#
@@ -54,12 +54,21 @@ CONFIGURE_DIR=$(BUILD_DIR)
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS= --disable-shared --with-pic
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+LCL_CONFIGURE_CFLAGS+=-m64
+.ENDIF
+
.IF "$(SYSBASE)"!=""
.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
+LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
+CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(SYSBASE)"!=""
+.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
+CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+.ENDIF
+
.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
BUILD_ACTION=make hyph_en_US.dic
.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
12-12-20Removal unnecessary using declarationsJosé Guilherme Vanz This commit just removes some unnecessary using declarations Change-Id: Ia1c7cc925b2db5b1172fae91dc703883d6539eaa Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/1430 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> 2012-11-28OUString::replace() does not modify in-placeTor Lillqvist Change-Id: I6fa7c64bdd3c7af4b9495831da063ecd917057de