[llvm-commits] CVS: llvm/Makefile.common

[Chris Lattner]

Changes in directory llvm:

Makefile.common updated: 1.124 -> 1.125

---
Log message:

Fix computation of LLVM_OBJ_ROOT for non-projects :(


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.124 llvm/Makefile.common:1.125
--- llvm/Makefile.common:1.124	Thu Aug 21 17:28:46 2003
+++ llvm/Makefile.common	Fri Aug 22 00:18:49 2003
@@ -116,18 +116,22 @@
 endif
 
 #
-# Set the LLVM source directory.
-# It is typically the root directory of what we're compiling now.
+# Set the LLVM object directory.
 #
-ifndef LLVM_SRC_ROOT
-LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
+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 object directory.
+# Set the LLVM source directory.
+# It is typically the root directory of what we're compiling now.
 #
-ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
+ifndef LLVM_SRC_ROOT
+LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
 ###########################################################################