[PATCH] make gcc-wrapper work even with ccache

David Ostrovsky (via Code Review) gerrit at gerrit.libreoffice.org
Tue Mar 19 14:39:35 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2857

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/2857/1

make gcc-wrapper work even with ccache

Change-Id: If97cc4f2af2adb6af1217cf7b095d0f0f7831bca
---
M solenv/gbuild/platform/com_MSC_class.mk
1 file changed, 5 insertions(+), 2 deletions(-)



diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
old mode 100644
new mode 100755
index 27211ef..612342d
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -550,10 +550,13 @@
 $(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := $(gb_AUTOCONF_WRAPPERS)
 endef
 
+# if ccache is enabled, then split it and use lastword as REAL_FOO
+# /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe
+
 gb_AUTOCONF_WRAPPERS := \
-	REAL_CC="$(shell cygpath -w $(CC))" \
+	REAL_CC="$(shell cygpath -w $(lastword $(CC)))" \
 	CC="$(call gb_Executable_get_target,gcc-wrapper)" \
-	REAL_CXX="$(shell cygpath -w $(CXX))" \
+	REAL_CXX="$(shell cygpath -w  $(lastword $(CXX)))" \
 	CXX="$(call gb_Executable_get_target,g++-wrapper)" \
     LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If97cc4f2af2adb6af1217cf7b095d0f0f7831bca
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>



More information about the LibreOffice mailing list