X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=cfb4c1258ed4c750a896121646ae1c3600074f48;hb=9e89ba31f16a960239a750a26a982b4c9dfe8949;hp=3fc59336f4af33b17bca1fdc7699ece59ff1bb24;hpb=a4a0323f634c792fc21ed4ed415f36b6e8cdfa8b;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index 3fc59336f4a..cfb4c1258ed 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,17 @@ 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
+# When cross-compiling, there are some things (tablegen) that need to
+# 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
 
-OPTIONAL_DIRS := examples projects bindings
 EXTRA_DIST := test llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config 
@@ -54,6 +61,23 @@ ifeq ($(MAKECMDGOALS),install)
   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
 
@@ -77,9 +101,9 @@ debug-opt-prof:
 dist-hook::
 	$(Echo) Eliminating files constructed by configure
 	$(Verb) $(RM) -f \
-	  $(TopDistDir)/include/llvm/ADT/hash_map  \
-	  $(TopDistDir)/include/llvm/ADT/hash_set  \
-	  $(TopDistDir)/include/llvm/ADT/iterator  \
+	  $(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
@@ -95,9 +119,9 @@ install-libs: install
 FilesToConfig := \
   include/llvm/Config/config.h \
   include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/hash_map \
-  include/llvm/ADT/hash_set \
-  include/llvm/ADT/iterator
+  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)
@@ -108,6 +132,7 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
 
 # NOTE: This needs to remain as the last target definition in this file so
 # that it gets executed last.
+ifneq ($(BUILD_DIRS_ONLY),1)
 all:: 
 	$(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
@@ -116,6 +141,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
@@ -150,8 +176,8 @@ SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
 		| $(AWK) '/Path:\ / {print $$2}'
 
 update:
-	$(SVN) $(SVN-UPDATE-OPTIONS) update
-	@ $(SVN) status | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) 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