PWN-Hunter/android_build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow win_sdk build with USE_CCACHE=1"

Browse Source
This commit is contained in:
David 'Digit' Turner 2011-03-15 03:31:19 -07:00 committed by Android Code Review
commit f8f95fc8b1
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/combo/select.mk
View File

@ -62,13 +62,23 @@ $(combo_target)PRELINKER_MAP := $(BUILD_SYSTEM)/prelink-$(combo_os_arch).map
include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk
ifneq ($(USE_CCACHE),) ifneq ($(USE_CCACHE),)
ccache := prebuilt/$(HOST_PREBUILT_TAG)/ccache/ccache CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)
# prepend ccache if necessary # If we are cross-compiling Windows binaries on Linux
ifneq ($(ccache),$(firstword $($(combo_target)CC))) # then use the linux ccache binary instead.
$(combo_target)CC := $(ccache) $($(combo_target)CC) ifeq ($(HOST_OS)-$(BUILD_OS),windows-linux)
CCACHE_HOST_TAG := linux-$(BUILD_ARCH)
endif endif
ifneq ($(ccache),$(firstword $($(combo_target)CXX))) ccache := prebuilt/$(CCACHE_HOST_TAG)/ccache/ccache
$(combo_target)CXX := $(ccache) $($(combo_target)CXX) # 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)
endif
ifneq ($(ccache),$(firstword $($(combo_target)CXX)))
$(combo_target)CXX := $(ccache) $($(combo_target)CXX)
endif
ccache =
endif endif
ccache =
endif endif