summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-11-02 17:22:57 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-11-02 17:22:57 +0000
commit76f9e57145cad97e937dd42645426e75633e8769 (patch)
tree36f48e652f84005cbb8c99bae3d61408ae017099
parent4489f948a7f9800c43d36164bf902a3880bb7d06 (diff)
downloadbcm5719-llvm-76f9e57145cad97e937dd42645426e75633e8769.tar.gz
bcm5719-llvm-76f9e57145cad97e937dd42645426e75633e8769.zip
Add back the top-level target for 'llvm-config' and the dependency edge
to force it to build after all library targets so it has complete dependency information. This should fix broken 'make install' with CMake. This is a partial revert of r143540, but it doesn't revert the most important part of that change: removing the dependency edge from LLVM tools to the llvm-config script. llvm-svn: 143548
-rw-r--r--llvm/tools/llvm-config/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
index 966557cc5cf..53f00846b79 100644
--- a/llvm/tools/llvm-config/CMakeLists.txt
+++ b/llvm/tools/llvm-config/CMakeLists.txt
@@ -125,6 +125,13 @@ add_custom_command(OUTPUT ${LLVM_CONFIG}
COMMENT "Building llvm-config script."
)
+add_custom_target(llvm-config.target ALL
+ DEPENDS ${LLVM_CONFIG})
+
+# Ensure we build llvm-config after we build all of the libraries so that we
+# have their full dependencies.
+add_dependencies(llvm-config.target ${llvm_libs})
+
install(FILES ${LLVM_CONFIG}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
OpenPOWER on IntegriCloud