From 3b7a4d811df5b326e714984edd7dd3e2b11e16d5 Mon Sep 17 00:00:00 2001 From: Marcin Kosiba Date: Thu, 19 Jun 2014 12:32:47 +0100 Subject: [PATCH] Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang. This is essentially Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253 applied to clang. Change-Id: I883f9e9a31fff50a64568a06ef5248437344542b --- core/clang/config.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/clang/config.mk b/core/clang/config.mk index 10b4d72abd..07ad60efd9 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -22,6 +22,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 :=