diff options
author | David Ostrovsky <david@ostrovsky.org> | 2013-03-19 22:28:01 +0100 |
---|---|---|
committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-20 00:02:10 +0000 |
commit | 13bfb441d9127fe1501a3dc43e88726825c0f95a (patch) | |
tree | 736c2effea47375b7b0e4e1a1ea1f5a30d1e9d3c /solenv | |
parent | b0149eccbfa080f6f5a51a02b33af58e1ee15f65 (diff) |
make gcc-wrapper work even with ccache
Change-Id: If97cc4f2af2adb6af1217cf7b095d0f0f7831bca
Reviewed-on: https://gerrit.libreoffice.org/2857
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'solenv')
-rwxr-xr-x[-rw-r--r--] | solenv/gbuild/platform/com_MSC_class.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 27211ef89085..612342d8e76a 100644..100755 --- 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" |