From 890d5bd263e7becc34a3dc9c23ef6cc5550609fe Mon Sep 17 00:00:00 2001 From: John Criswell Date: Mon, 16 Jun 2003 19:14:31 +0000 Subject: Modified the environment variables that determine where things are located to do the following: 1) Determine their default values without $HOME 2) Configure the default values as full absolute pathnames. This should help fix the nightly test builds. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6719 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index b2411900bf..caeedb0073 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -72,7 +72,7 @@ endif # Set the source root directory. # ifndef BUILD_SRC_ROOT -BUILD_SRC_ROOT = $(BUILD_SRC_DIR)/$(LEVEL) +BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd) endif # @@ -83,7 +83,7 @@ ifndef BUILD_OBJ_DIR ifeq ($(OBJ_ROOT),.) BUILD_OBJ_DIR = $(shell pwd) else -BUILD_OBJ_DIR := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(shell cd $(BUILD_SRC_DIR); pwd)) +BUILD_OBJ_DIR := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_DIR); pwd)) endif endif @@ -94,7 +94,7 @@ ifndef BUILD_OBJ_ROOT ifeq ($(OBJ_ROOT),.) BUILD_OBJ_ROOT = $(shell cd $(LEVEL); pwd) else -BUILD_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(shell cd $(LEVEL); pwd)) +BUILD_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_ROOT); pwd)) endif endif -- cgit v1.2.3