summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-10-27 21:25:09 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-10-27 21:25:09 +0000
commitbfc62b06e21bf9cd6bfc3bcd3076ed6fd0ea2bbf (patch)
treeac1ccdb06242691cf203f610e6aaf2c34370a5c9
parentc0a6e0619d3ae484f2a933409cadb6c853e67907 (diff)
downloadbcm5719-llvm-bfc62b06e21bf9cd6bfc3bcd3076ed6fd0ea2bbf.tar.gz
bcm5719-llvm-bfc62b06e21bf9cd6bfc3bcd3076ed6fd0ea2bbf.zip
projects/sample: Switch over to imported Makefile setup.
- This will require you to manually reconfigure the projects/sample project (by running projects/config/sample/config.status --recheck) if you haven't updated/built since the 1st part of this commit went in. llvm-svn: 143148
-rw-r--r--llvm/projects/sample/Makefile.common.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/projects/sample/Makefile.common.in b/llvm/projects/sample/Makefile.common.in
index ac08a52ac5d..758423b8959 100644
--- a/llvm/projects/sample/Makefile.common.in
+++ b/llvm/projects/sample/Makefile.common.in
@@ -18,5 +18,9 @@ PROJ_OBJ_ROOT := $(subst //,/,@abs_top_builddir@)
# Set the root directory of this project's install prefix
PROJ_INSTALL_ROOT := @prefix@
-# Include LLVM's Master Makefile.
-include $(LLVM_SRC_ROOT)/Makefile.common
+# Configuration file to set paths specific to local installation of LLVM
+include $(PROJ_OBJ_ROOT)/Makefile.llvm.config
+
+# Include all of the build rules used for making LLVM
+include $(PROJ_SRC_ROOT)/Makefile.llvm.rules
+
OpenPOWER on IntegriCloud