# The files we are going to generate using llvm-build.
LLVMBuildMakeFrag := $(PROJ_OBJ_ROOT)/Makefile.llvmbuild
LLVMConfigLibraryDependenciesInc := \
- $(PROJ_OBJ_ROOT)/tools/llvm-config/LibraryDependencies.inc
+ $(PROJ_OBJ_ROOT)/tools/llvm-config-2/LibraryDependencies.inc
# The rule to create the LLVMBuild Makefile fragment as well as the llvm-config
# library table.
#
# Note that this target gets its real dependencies generated for us by
# llvm-build.
-$(LLVMBuildMakeFrag):
- $(EchoCmd) Constructing LLVMBuild project information. ; \
- $(LLVMBuildTool) \
+#
+# We include a dependency on this Makefile to ensure that changes to the
+# generation command get picked up.
+$(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules
+ $(Echo) Constructing LLVMBuild project information.
+ $(Verb) $(LLVMBuildTool) \
+ --native-target "$(ARCH)" \
+ --enable-targets "$(TARGETS_TO_BUILD)" \
--write-library-table $(LLVMConfigLibraryDependenciesInc) \
--write-make-fragment $(LLVMBuildMakeFrag)
+# For completeness, let Make know how the extra files are generated.
+$(LLVMConfigLibraryDependenciesInc): $(LLVMBuildMakeFrag)
+
# Include the generated Makefile fragment.
#
# We currently only include the dependencies for the fragment itself if we are