From f0f463eb636bd27a78669a1bd702fe50c4ee694f Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 22 Aug 2003 05:18:49 +0000
Subject: [PATCH] Fix computation of LLVM_OBJ_ROOT for non-projects :(

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8046 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile.common | 18 +++++++++++-------
 Makefile.rules  | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 47c5f7b5dea..3bdee2ae158 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -115,6 +115,17 @@ BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
 endif
 endif
 
+#
+# Set the LLVM object directory.
+#
+ifndef LLVM_OBJ_ROOT
+ifdef LLVM_SRC_ROOT
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
+else
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LEVEL); pwd)
+endif
+endif
+
 #
 # Set the LLVM source directory.
 # It is typically the root directory of what we're compiling now.
@@ -123,13 +134,6 @@ ifndef LLVM_SRC_ROOT
 LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
-#
-# Set the LLVM object directory.
-#
-ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
-endif
-
 ###########################################################################
 # Default Targets:
 #	The following targets are the standard top level targets for
diff --git a/Makefile.rules b/Makefile.rules
index 47c5f7b5dea..3bdee2ae158 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -115,6 +115,17 @@ BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
 endif
 endif
 
+#
+# Set the LLVM object directory.
+#
+ifndef LLVM_OBJ_ROOT
+ifdef LLVM_SRC_ROOT
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
+else
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LEVEL); pwd)
+endif
+endif
+
 #
 # Set the LLVM source directory.
 # It is typically the root directory of what we're compiling now.
@@ -123,13 +134,6 @@ ifndef LLVM_SRC_ROOT
 LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
-#
-# Set the LLVM object directory.
-#
-ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
-endif
-
 ###########################################################################
 # Default Targets:
 #	The following targets are the standard top level targets for