X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=849c70bc04c1d0621be5abffae2e9f9846c4e81f;hb=9a6b92de4c2207b427f3b9cd67cd122dafc5b6c6;hp=3fdae66c413e716c6242cc68ae049e94e091eabe;hpb=eb909ca524f89a24c9bc668aebd9204783576ff2;p=oota-llvm.git

diff --git a/Makefile.rules b/Makefile.rules
index 3fdae66c413..849c70bc04c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -184,7 +184,7 @@ endif
 $(UserTargets):: $(PreConditions)
 
 all:: all-local
-clean:: clean-local 
+clean:: clean-local
 clean-all:: clean-local clean-all-local
 install:: install-local
 uninstall:: uninstall-local
@@ -309,29 +309,17 @@ endif
 #--------------------------------------------------------------------
 TargetMode :=
 ifeq ($(LLVM_CROSS_COMPILING),1)
-  ifeq ($(BUILD_COMPONENT),1)
-    TargetMode := Build
-  else
-    TargetMode := Host
-  endif
-  BuildLLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/Build/bin
+  BuildLLVMToolDir := $(LLVM_OBJ_ROOT)/BuildTools/$(BuildMode)/bin
 endif
 
 ObjRootDir  := $(PROJ_OBJ_DIR)/$(BuildMode)
-# It is very important that ObjDir not have an extra trailing
-# slash. This ends up changing the rules so that dependency file (.d)
-# information is not used at all!
-ifeq ($(TargetMode),)
-  ObjDir      := $(ObjRootDir)
-else
-  ObjDir      := $(ObjRootDir)/$(TargetMode)
-endif
-LibDir      := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib
-ToolDir     := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin
-ExmplDir    := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples
-LLVMLibDir  := $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib
-LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin
-LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples
+ObjDir      := $(ObjRootDir)
+LibDir      := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib
+ToolDir     := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin
+ExmplDir    := $(PROJ_OBJ_ROOT)/$(BuildMode)/examples
+LLVMLibDir  := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib
+LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
+LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples
 CFERuntimeLibDir := $(LLVMGCCDIR)/lib
 
 #--------------------------------------------------------------------
@@ -347,7 +335,7 @@ LLVMAS   := $(LLVMToolDir)/llvm-as$(EXEEXT)
 endif
 ifndef TBLGEN
   ifeq ($(LLVM_CROSS_COMPILING),1)
-    TBLGEN   := $(BuildLLVMToolDir)/tblgen$(EXEEXT)
+    TBLGEN   := $(BuildLLVMToolDir)/tblgen$(BUILD_EXEEXT)
   else
     TBLGEN   := $(LLVMToolDir)/tblgen$(EXEEXT)
   endif
@@ -594,16 +582,6 @@ ifdef DIRS
 SubDirs += $(DIRS)
 
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-ifdef BUILD_TARGET_DIRS
-$(RecursiveTargets)::
-	$(Verb) for dir in $(BUILD_TARGET_DIRS); do \
-	    if [ ! -f $$dir/Makefile ]; then \
-            $(MKDIR) $$dir; \
-              $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
-	    fi; \
-            ($(MAKE) -C $$dir $@ BUILD_COMPONENT=1 NO_INSTALL=1 ) || exit 1; \
-          done
-endif
 $(RecursiveTargets)::
 	$(Verb) for dir in $(DIRS); do \
 	  if [ ! -f $$dir/Makefile ]; then \
@@ -613,12 +591,6 @@ $(RecursiveTargets)::
 	  ($(MAKE) -C $$dir $@ ) || exit 1; \
 	done
 else
-ifdef BUILD_TARGET_DIRS
-$(RecursiveTargets)::
-	$(Verb) for dir in $(BUILD_TARGET_DIRS); do \
-            ($(MAKE) -C $$dir $@ BUILD_COMPONENT=1 NO_INSTALL=1 ) || exit 1; \
-          done
-endif
 $(RecursiveTargets)::
 	$(Verb) for dir in $(DIRS); do \
 	  ($(MAKE) -C $$dir $@ ) || exit 1; \