Fix srcdir <> objdir builds with ocaml 2.10. Downrev versions don't care whether

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 97a738805d6bce4ce7a16e1abd5873c2737887f4..c367e731acd2ab2920528c3add6cafb22ab012f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,23 +15,30 @@ LEVEL := .
 #   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, docs.
+#   6. Build tools, runtime, docs.
 #
 DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
-        tools docs
-        
-OPTIONAL_DIRS := examples projects
+        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.  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
+
 ifeq ($(MAKECMDGOALS),libs-only)
-  DIRS := $(filter-out tools docs, $(DIRS))
+  DIRS := $(filter-out tools runtime docs, $(DIRS))
   OPTIONAL_DIRS :=
 endif
 
 ifeq ($(MAKECMDGOALS),tools-only)
-  DIRS := $(filter-out docs, $(DIRS))
+  DIRS := $(filter-out runtime docs, $(DIRS))
   OPTIONAL_DIRS :=
 endif
 
@@ -39,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.
@@ -104,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
@@ -112,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
+