am df45c6fa: Merge "Add platform support for building LLVMgold.so in LLVM."

[android-x86/external-llvm.git] / llvm-gen-intrinsics.mk

diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk
index decccdd..4fc7b76 100644 (file)
--- a/llvm-gen-intrinsics.mk
+++ b/llvm-gen-intrinsics.mk
@@ -1,5 +1,5 @@
 # We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does
-INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/Intrinsics.td
+INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/IR/Intrinsics.td
 INTRINSICTDS := $(wildcard $(dir $(INTRINSICTD))/Intrinsics*.td)
 
 LOCAL_SRC_FILES := $(INTRINSICTD) $(LOCAL_SRC_FILES)
@@ -8,9 +8,10 @@ ifeq ($(LOCAL_MODULE_CLASS),)
        LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 endif
 
-GENFILE := $(addprefix $(call local-intermediates-dir)/llvm/,Intrinsics.gen)
+GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,Intrinsics.gen)
 LOCAL_GENERATED_SOURCES += $(GENFILE)
-$(GENFILE): $(INTRINSICTD) $(INTRINSICTDS) $(TBLGEN)
+$(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(GENFILE): $(INTRINSICTD) $(INTRINSICTDS) | $(LLVM_TBLGEN)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
        $(call transform-host-td-to-out,intrinsic)
 else