From 3e3d7b5ce5596a76980660fe651e05fcd816ed0d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 3 Aug 2015 14:06:58 -0700 Subject: [PATCH] Don't prepend CC_WRAPPER to CLANG. We have deferred the CC_WRAPPER prepending to binary.mk per module. Bug: 22612634 Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5 (cherry-pick from commit 66c8e8c756fb1790cac792b32ba2de057c3b1b4e) --- core/clang/config.mk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/clang/config.mk b/core/clang/config.mk index 4875ea12f..e7473622e 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -18,18 +18,6 @@ LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) LLVM_TBLGEN := $(BUILD_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 := CLANG_CONFIG_EXTRA_CFLAGS := -- 2.11.0