Kaydet (Commit) 13bfb441 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) David Ostrovsky

make gcc-wrapper work even with ccache

Change-Id: If97cc4f2af2adb6af1217cf7b095d0f0f7831bca
Reviewed-on: https://gerrit.libreoffice.org/2857Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
üst b0149ecc
...@@ -550,10 +550,13 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Executable_ge ...@@ -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) $(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := $(gb_AUTOCONF_WRAPPERS)
endef 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 := \ gb_AUTOCONF_WRAPPERS := \
REAL_CC="$(shell cygpath -w $(CC))" \ REAL_CC="$(shell cygpath -w $(lastword $(CC)))" \
CC="$(call gb_Executable_get_target,gcc-wrapper)" \ 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)" \ CXX="$(call gb_Executable_get_target,g++-wrapper)" \
LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment