Merge "Fix host multilib build."
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index a2ae405..9619e0b 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -7,7 +7,7 @@
ifneq ($(strip $(TBLGEN_TABLES)),)
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
ifneq ($(findstring AttrDump.inc,$(TBLGEN_TABLES)),)
LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/AttrDump.inc
diff --git a/clang-version-inc.mk b/clang-version-inc.mk
index 5a26276..28ea54a 100644
--- a/clang-version-inc.mk
+++ b/clang-version-inc.mk
@@ -5,7 +5,7 @@
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
endif
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
LLVMVersion := $(shell grep PACKAGE_VERSION $(LLVM_ROOT_PATH)/host/include/llvm/Config/config.h | sed -e 's/\#define PACKAGE_VERSION "\(.*\)"/\1/g')
@@ -33,4 +33,3 @@
-e "s#@CLANG_VERSION_PATCHLEVEL@#$(CLANG_VERSION_PATCHLEVEL)#g" \
-e "s#@CLANG_HAS_VERSION_PATCHLEVEL@#$(CLANG_HAS_VERSION_PATCHLEVEL)#g" \
$< > $@
-