[Libreoffice-commits] .: writerfilter/Library_resourcemodel.mk

[Caolán McNamara]

 writerfilter/Library_resourcemodel.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 94a5174e5903c90744b02bc8862031ee818b58e0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 16 15:35:05 2011 +0000

    get this to build on ppc64 linux

diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 13d5704..f485ef7 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -75,9 +75,23 @@ $(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\
     CustomTarget/writerfilter/source/sprmcodetostr \
 ))
 
+
+ifneq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-POWERPC64)
+#Apparently some compilers, according to the original .mk this was converted
+#from, require this to be noopt or they fail to compile it, probably good to
+#revisit that and narrow this down to where it's necessary
 $(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
     CustomTarget/writerfilter/source/qnametostr \
 	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
+else
+#Ironically, on RHEL-6 PPC64 with no-opt the output is too large for the
+#toolchain, "Error: operand out of range", but it build fine with
+#normal flags
+$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
+    CustomTarget/writerfilter/source/qnametostr \
+	, $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
 
 # vim: set noet sw=4 ts=4: