x86_64 was completely missing from the target triples supported by the X86 code

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index d453330a2e9dd41baabfdd7f7d3f42bba0dc8434..123595dc55ec212d5782bdf4a6415792b77700b8 100644 (file)
--- 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 := .
@@ -30,7 +30,7 @@ endif
 
 EXTRA_DIST := test unittests llvm.spec include win32 Xcode
 
-include $(LEVEL)/Makefile.config 
+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
@@ -54,15 +54,26 @@ ifeq ($(MAKECMDGOALS),tools-only)
   OPTIONAL_DIRS :=
 endif
 
+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
 
-# Don't install utils, examples, or projects they are only used to 
-# build LLVM.
+# 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
 
@@ -106,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
 
 #------------------------------------------------------------------------
@@ -124,13 +135,11 @@ install-libs: install
 FilesToConfig := \
   include/llvm/Config/config.h \
   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)
@@ -138,7 +147,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:: 
+all::
        $(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
        $(Echo) '*****' Note: Debug build can be 10 times slower than an
@@ -154,10 +163,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:
@@ -177,7 +186,7 @@ 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: