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

Commit 18c20aae authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""" 

* commit 'aea1cae4':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
parents 9929fd66 aea1cae4

core/clang/config.mk

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) 
CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)

LLVM_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)



# The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars.

ifdef CC_WRAPPER

  ifneq ($(CC_WRAPPER),$(firstword $(CLANG)))

    CLANG := $(CC_WRAPPER) $(CLANG)

  endif

endif

ifdef CXX_WRAPPER

  ifneq ($(CXX_WRAPPER),$(firstword $(CLANG_CXX)))

    CLANG_CXX := $(CXX_WRAPPER) $(CLANG_CXX)

  endif

endif



# Clang flags for all host or target rules

CLANG_CONFIG_EXTRA_ASFLAGS :=

core/combo/select.mk

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ ifneq ($(USE_CCACHE),) 
  # on a workstation.

  export CCACHE_BASEDIR := /



  # Workaround for ccache with clang.

  # See http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

  export CCACHE_CPP2 := true



  CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)

  # If we are cross-compiling Windows binaries on Linux

  # then use the linux ccache binary instead.