Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55aad086 authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

Allow win_sdk build with USE_CCACHE=1 

This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.

There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.

Note: Depends on https://review.source.android.com//#change,21755
      for a complete solution to the problem.

Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
parent 0683a773

core/combo/select.mk

+17 −7
Original line number Diff line number Diff line
@@ -62,7 +62,16 @@ $(combo_target)PRELINKER_MAP := $(BUILD_SYSTEM)/prelink-$(combo_os_arch).map 
include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk



ifneq ($(USE_CCACHE),)

  ccache := prebuilt/$(HOST_PREBUILT_TAG)/ccache/ccache

  CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)

  # If we are cross-compiling Windows binaries on Linux

  # then use the linux ccache binary instead.

  ifeq ($(HOST_OS)-$(BUILD_OS),windows-linux)

    CCACHE_HOST_TAG := linux-$(BUILD_ARCH)

  endif

  ccache := prebuilt/$(CCACHE_HOST_TAG)/ccache/ccache

  # Check that the executable is here.

  ccache := $(strip $(wildcard $(ccache)))

  ifdef ccache

    # prepend ccache if necessary

    ifneq ($(ccache),$(firstword $($(combo_target)CC)))

      $(combo_target)CC := $(ccache) $($(combo_target)CC)
@@ -72,3 +81,4 @@ ifneq ($(USE_CCACHE),) 
    endif

    ccache =

  endif

endif