Ugh, really fix it now... :(

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8047 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index 3bdee2ae158d703d2472efa1fe352f89346b7eb9..b5d1e54b65f701def21ec2251927d4273281f737 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -122,7 +122,7 @@ 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)
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_ROOT); pwd)
 endif
 endif
 

diff --git a/Makefile.rules b/Makefile.rules
index 3bdee2ae158d703d2472efa1fe352f89346b7eb9..b5d1e54b65f701def21ec2251927d4273281f737 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -122,7 +122,7 @@ 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)
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_ROOT); pwd)
 endif
 endif