X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=e750889ae45c6a55af0a92dde175ebbb09d66799;hb=ab7c09b6b6f4516a631fd6788918c237c83939af;hp=58a5fe5e1833fe732055baca8fae2db89a276060;hpb=673612ec72e0e246ca671a3977666424b5ed77cc;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index 58a5fe5e183..e750889ae45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 #===- ./Makefile -------------------------------------------*- Makefile -*--===#
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 #===------------------------------------------------------------------------===#
 
 LEVEL := .
@@ -17,20 +17,21 @@ LEVEL := .
 #   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 
-
 # When cross-compiling, there are some things (tablegen) that need to
-# be build for the build system.
-ifeq ($(LLVM_CROSS_COMPILING),1)
-  BUILD_TARGET_DIRS := lib/System lib/Support utils
+# be build for the build system first.
+ifeq ($(BUILD_DIRS_ONLY),1)
+  DIRS := lib/System lib/Support utils
+  OPTIONAL_DIRS :=
+else
+  DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+          tools runtime docs
+  OPTIONAL_DIRS := examples projects bindings
 endif
 
+EXTRA_DIST := test unittests 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.
@@ -53,13 +54,46 @@ ifeq ($(MAKECMDGOALS),tools-only)
   OPTIONAL_DIRS :=
 endif
 
-# Don't install utils, examples, or projects they are only used to 
-# build LLVM.
+ifeq ($(MAKECMDGOALS),install-clang)
+  DIRS := tools/clang/tools/driver tools/clang/tools/clang-cc \
+	tools/clang/lib/Headers tools/clang/docs
+  OPTIONAL_DIRS :=
+  NO_INSTALL = 1
+endif
+
+ifeq ($(MAKECMDGOALS),clang-only)
+  DIRS := $(filter-out tools runtime docs, $(DIRS)) tools/clang
+  OPTIONAL_DIRS :=
+endif
+
+ifeq ($(MAKECMDGOALS),unittests)
+  DIRS := $(filter-out tools runtime docs, $(DIRS)) utils unittests
+  OPTIONAL_DIRS :=
+endif
+
+# Use NO_INSTALL define of the Makefile of each directory for deciding
+# if the directory is installed or not
 ifeq ($(MAKECMDGOALS),install)
-  DIRS := $(filter-out utils, $(DIRS))
   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
+# If we're cross-compiling, build the build-hosted tools first
+ifeq ($(LLVM_CROSS_COMPILING),1)
+all:: cross-compile-build-tools
+
+clean::
+	$(Verb) rm -rf BuildTools
+
+cross-compile-build-tools:
+	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
+          $(MKDIR) BuildTools; \
+	  cd BuildTools ; \
+	  $(PROJ_SRC_DIR)/configure ; \
+	  cd .. ; \
+	fi; \
+        ($(MAKE) -C BuildTools BUILD_DIRS_ONLY=1 ) || exit 1;
+endif
+
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
@@ -83,15 +117,15 @@ debug-opt-prof:
 dist-hook::
 	$(Echo) Eliminating files constructed by configure
 	$(Verb) $(RM) -f \
-	  $(TopDistDir)/include/llvm/ADT/hash_map.h  \
-	  $(TopDistDir)/include/llvm/ADT/hash_set.h  \
 	  $(TopDistDir)/include/llvm/ADT/iterator.h  \
 	  $(TopDistDir)/include/llvm/Config/config.h  \
 	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
 	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
+clang-only: all
 tools-only: all
 libs-only: all
+install-clang: install
 install-libs: install
 
 #------------------------------------------------------------------------
@@ -100,21 +134,22 @@ install-libs: install
 #------------------------------------------------------------------------
 FilesToConfig := \
   include/llvm/Config/config.h \
+  include/llvm/Config/Targets.def \
+	include/llvm/Config/AsmPrinters.def \
   include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/hash_map.h \
-  include/llvm/ADT/hash_set.h \
   include/llvm/ADT/iterator.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
 all-local:: $(FilesToConfigPATH)
-$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
 	$(Echo) Regenerating $*
 	$(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
 .PRECIOUS: $(FilesToConfigPATH)
 
 # NOTE: This needs to remain as the last target definition in this file so
 # that it gets executed last.
-all:: 
+ifneq ($(BUILD_DIRS_ONLY),1)
+all::
 	$(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
 	$(Echo) '*****' Note: Debug build can be 10 times slower than an
@@ -122,6 +157,7 @@ ifeq ($(BuildMode),Debug)
 	$(Echo) '*****' make an optimized build. Alternatively you can
 	$(Echo) '*****' configure with --enable-optimized.
 endif
+endif
 
 check-llvm2cpp:
 	$(Verb)$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
@@ -129,10 +165,10 @@ check-llvm2cpp:
 check-one:
 	$(Verb)$(MAKE) -C test check-one TESTONE=$(TESTONE)
 
-srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+srpm: $(LLVM_OBJ_ROOT)/llvm.spec
 	rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
 
-rpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+rpm: $(LLVM_OBJ_ROOT)/llvm.spec
 	rpmbuild -bb --target $(TARGET_TRIPLE) $(LLVM_OBJ_ROOT)/llvm.spec
 
 show-footprint:
@@ -152,14 +188,14 @@ SVN = svn
 SVN-UPDATE-OPTIONS =
 AWK = awk
 SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
-		| LANG=C xargs $(SVN) info 2>/dev/null \
+		| LC_ALL=C xargs $(SVN) info 2>/dev/null \
 		| $(AWK) '/Path:\ / {print $$2}'
 
 update:
 	$(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)
 	@ $(SVN) status $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
 
-happiness: update all check
+happiness: update all check unittests
 
 .PHONY: srpm rpm update happiness