Move DataTypes.h to include/llvm/System, update all users. This breaks the last

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index ce79465dc8f6ef8beea93dfaf3d229699344d3b6..001d2ad1895e3c10fd1548fb8470ff30d91facf9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,12 @@ LEVEL := .
 #
 # When cross-compiling, there are some things (tablegen) that need to
 # be build for the build system first.
-ifndef RC_ARCHS  # Normal build (not "Apple-style").
+
+# If "RC_ProjectName" exists in the environment, and its value is
+# "llvmCore", then this is an "Apple-style" build; search for
+# "Apple-style" in the comments for more info.  Anything else is a
+# normal build.
+ifneq ($(RC_ProjectName),llvmCore)  # Normal build (not "Apple-style").
 ifeq ($(BUILD_DIRS_ONLY),1)
   DIRS := lib/System lib/Support utils
   OPTIONAL_DIRS :=
@@ -128,8 +133,7 @@ dist-hook::
        $(Echo) Eliminating files constructed by configure
        $(Verb) $(RM) -f \
          $(TopDistDir)/include/llvm/Config/config.h  \
-         $(TopDistDir)/include/llvm/Support/DataTypes.h  \
-         $(TopDistDir)/include/llvm/Support/ThreadSupport.h
+         $(TopDistDir)/include/llvm/System/DataTypes.h
 
 clang-only: all
 tools-only: all
@@ -145,7 +149,7 @@ FilesToConfig := \
   include/llvm/Config/config.h \
   include/llvm/Config/Targets.def \
        include/llvm/Config/AsmPrinters.def \
-  include/llvm/Support/DataTypes.h \
+  include/llvm/System/DataTypes.h \
        tools/llvmc/plugins/Base/Base.td
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
@@ -213,7 +217,8 @@ happiness: update all check unittests
 .NOTPARALLEL:
 
 else # Building "Apple-style."
-# N.B. In an Apple-style build, once configuration is done, lines
-# marked "Apple-style" are removed with sed!  See utils/buildit/build_llvm.
-include utils/buildit/GNUmakefile # Building "Apple-style."
+# In an Apple-style build, once configuration is done, lines marked
+# "Apple-style" are removed with sed!  Please don't remove these!
+# Look for the string "Apple-style" in utils/buildit/build_llvm.
+include $(shell find . -name GNUmakefile) # Building "Apple-style."
 endif # Building "Apple-style."