From 5c0a389532ffd5e6ec82bb12178c7537b0481044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 31 Jan 2012 22:09:32 +0000 Subject: [PATCH] use a $(COM)-$(OS)-$(CPUNAME) pattern i.e. same pattern as sc/Library_vbaobj.mk and writerfilter/Library_resourcemodel.mk and document that its a compile time error which can be retested anytime with a new toolchain, not some weird scary runtime error so must never be touched. --- oox/Library_oox.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 089605daa527..6e4b60ef7398 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -40,7 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\ -I$(realpath $(SRCDIR)/oox/inc) \ )) -ifeq ($(CPUNAME),IA64) +ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64) +#Debian Linux ia64 fails at compile time on +#oox/source/drawingml/customshapepresets*.cxx which are apparently too large +#for the toolchain to handle with default optimization $(eval $(call gb_Library_add_cxxflags,oox,\ -Os \ ))