From 9a6d88d38b974f36642700c4b0f3e725c4fde450 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 20 Oct 2009 02:23:13 +0000
Subject: [PATCH] Revert "Tweak top-level Makefile to facilitate Apple-style
 build.", this is breaking Clang's Apple-style build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84592 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile                  | 6 ------
 utils/buildit/GNUmakefile | 2 +-
 utils/buildit/build_llvm  | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index ce79465dc8f..f3bf3f2345e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ 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").
 ifeq ($(BUILD_DIRS_ONLY),1)
   DIRS := lib/System lib/Support utils
   OPTIONAL_DIRS :=
@@ -212,8 +211,3 @@ 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."
-endif # Building "Apple-style."
diff --git a/utils/buildit/GNUmakefile b/utils/buildit/GNUmakefile
index 997188333c1..e3b334a045d 100644
--- a/utils/buildit/GNUmakefile
+++ b/utils/buildit/GNUmakefile
@@ -59,7 +59,7 @@ endif
 # NOTE : Always put version numbers at the end because they are optional.
 install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
-	  $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
+	  $(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
 	    $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm
index 2bdb208237d..91fbe15be47 100755
--- a/utils/buildit/build_llvm
+++ b/utils/buildit/build_llvm
@@ -82,10 +82,6 @@ SRC_DIR=$DIR/src
 rm -rf $SRC_DIR || exit 1
 mkdir $SRC_DIR || exit 1
 ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
-# We can't use the top-level Makefile as-is.  Remove the soft link:
-rm $SRC_DIR/Makefile || exit 1
-# Now create our own by editing the top-level Makefile, deleting every line marked "Apple-style":
-sed -e '/[Aa]pple-style/d' -e '/include.*GNUmakefile/d' $ORIG_SRC_DIR/Makefile > $SRC_DIR/Makefile || exit 1
 
 # Build the LLVM tree universal.
 mkdir -p $DIR/obj-llvm || exit 1
-- 
2.34.1