[PATCH] disable ccache on windows/msc when building liblangtag

Christian Lohmaier (via Code Review) gerrit at gerrit.libreoffice.org
Fri May 3 06:57:44 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3760

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3760/1

disable ccache on windows/msc when building liblangtag

liblangtag uses quoted strings in defines, like -DFOO="\"value\"" and
ccache (at least the one available from the windows build dependencies
wiki page) gets confused and doesn't parse the arguments correctly to
the actual compiler, resulting in the error
"cl : Command line error D8003 : missing source filename"

Change-Id: I456b98b8956a25ff9acd3ab776c0c6f149a08ac7
---
M liblangtag/ExternalProject_langtag.mk
1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 757c6775..9e344b9 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -19,6 +19,9 @@
 	build \
 ))
 
+# disable ccache on windows, as it doesn't cope with the quoted defines
+# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
+# Results in "cl : Command line error D8003 : missing source filename"
 $(call gb_ExternalProject_get_state_target,langtag,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
@@ -32,6 +35,6 @@
 		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
 		$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
 		$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
-		&& $(MAKE) \
+		&& $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") $(MAKE) \
 	)
 # vim: set noet sw=4 ts=4:

-- 
To view, visit https://gerrit.libreoffice.org/3760
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I456b98b8956a25ff9acd3ab776c0c6f149a08ac7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>



More information about the LibreOffice mailing list