X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=Makefile;h=0be1f122aac15f7637ffb9a49dec2fb19f5e3a43;hp=8f16ce2e7b330bc94cee2c336298ce7cfde5c9fc;hb=f70414f3d06cacd8a681bd756248ca71e50d1817;hpb=1e46ae47b1dfe2d8f59da9cac9cedb52390c50fe

diff --git a/Makefile b/Makefile
index 8f16ce2e7b3..0be1f122aac 100644
--- a/Makefile
+++ b/Makefile
@@ -19,16 +19,18 @@ LEVEL := .
 #
 DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
         tools runtime docs
-        
+
 OPTIONAL_DIRS := examples projects
 EXTRA_DIST := test llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config 
 
-# llvm-gcc4 doesn't need runtime libs.
-ifeq ($(LLVMGCC_MAJVERS),4)
+# llvm-gcc4 doesn't need runtime libs.  llvm-gcc4 is the only supported one.
+# FIXME: Remove runtime entirely once we have an understanding of where
+# libprofile etc should go.
+#ifeq ($(LLVMGCC_MAJVERS),4)
   DIRS := $(filter-out runtime, $(DIRS))
-endif
+#endif
 
 ifeq ($(MAKECMDGOALS),libs-only)
   DIRS := $(filter-out tools runtime docs, $(DIRS))
@@ -40,6 +42,13 @@ ifeq ($(MAKECMDGOALS),tools-only)
   OPTIONAL_DIRS :=
 endif
 
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
@@ -102,7 +111,10 @@ ifeq ($(BuildMode),Debug)
 endif
 
 check-llvm2cpp:
-	$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+	$(Verb)$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+
+check-one:
+	$(Verb)$(MAKE) -C test check-one TESTONE=$(TESTONE)
 
 srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
 	rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
@@ -116,4 +128,12 @@ show-footprint:
 	$(Verb) du -sk $(ExmplDir)
 	$(Verb) du -sk $(ObjDir)
 
+build-for-llvm-top:
+	$(Verb) if test ! -f ./config.status ; then \
+	  ./configure --prefix="$(LLVM_TOP)/install" \
+	    --with-llvm-gcc="$(LLVM_TOP)/llvm-gcc" ; \
+	fi
+	$(Verb) $(MAKE) tools-only
+
 .PHONY: srpm rpm
+