mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-25 04:39:44 +00:00
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
This commit is contained in:
parent
ff97fbc527
commit
890d5bd263
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user