solenv/gbuild/platform/com_MSC_class.mk | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 13bfb441d9127fe1501a3dc43e88726825c0f95a
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Tue Mar 19 22:28:01 2013 +0100
make gcc-wrapper work even with ccache
Change-Id: If97cc4f2af2adb6af1217cf7b095d0f0f7831bca
Reviewed-on: https://gerrit.libreoffice.org/2857
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: David Ostrovsky <david.ostrov...@gmx.de>
Tested-by: David Ostrovsky <david.ostrov...@gmx.de>
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_preparation_target,$(1)) :
$(call gb_Executable_ge
$(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"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
