X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=Makefile;h=c367e731acd2ab2920528c3add6cafb22ab012f3;hp=0a27cbed46bd67596aaadc105bf04a26889aca90;hb=ab4456f10a72f3a7c73dac0e95578b9b7e4250b8;hpb=f7c75a6832d86885db3af408307c42e7f1a1adac

diff --git a/Makefile b/Makefile
index 0a27cbed46b..c367e731acd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,29 @@
 #===------------------------------------------------------------------------===#
 
 LEVEL := .
-DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
-OPTIONAL_DIRS := examples projects
+
+# Top-Level LLVM Build Stages:
+#   1. Build lib/System and lib/Support, which are used by utils (tblgen).
+#   2. Build utils, which is used by VMCore.
+#   3. Build VMCore, which builds the Intrinsics.inc file used by libs.
+#   4. Build libs, which are needed by llvm-config.
+#   5. Build llvm-config, which determines inter-lib dependencies for tools.
+#   6. Build tools, runtime, docs.
+#
+DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+        tools runtime docs
+
+OPTIONAL_DIRS := examples projects bindings
 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))
@@ -33,7 +46,7 @@ endif
 # build LLVM.
 ifeq ($(MAKECMDGOALS),install)
   DIRS := $(filter-out utils, $(DIRS))
-  OPTIONAL_DIRS :=
+  OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
 # Include the main makefile machinery.
@@ -98,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
@@ -106,4 +122,18 @@ srpm: $(LLVM_OBJ_ROOT)/llvm.spec
 rpm: $(LLVM_OBJ_ROOT)/llvm.spec 
 	rpmbuild -bb --target $(TARGET_TRIPLE) $(LLVM_OBJ_ROOT)/llvm.spec
 
+show-footprint:
+	$(Verb) du -sk $(LibDir)
+	$(Verb) du -sk $(ToolDir)
+	$(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
+