diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-07-28 05:05:00 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-07-28 05:05:00 +0000 |
| commit | aea7fe4abd1f54edd3cbdadcbd8f0e2e99c5acf3 (patch) | |
| tree | 4ed17a7390c8dd885180d0037c7f237e2e63cec7 /Makefile.config.in | |
| parent | d91e5f911f5fc840725771d3b27211b9748659e3 (diff) | |
For PR848:
1. Get the path to the pwd binary (/bin/pwd usually) from configure.
2. Use that path to run pwd in all path variables set in Makefile.config.in
The hope is that these changes will resolve symlinks to physical paths. This
should work on all platforms where the binary pwd defaults to printing
physical paths. The shell version of pwd generally doesn't (it will print
the symlink path).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29381 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.config.in')
| -rw-r--r-- | Makefile.config.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 9b2deac1261..92b4e3ff7e0 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -33,19 +33,20 @@ LLVM_CONFIGTIME := @LLVM_CONFIGTIME@ # ########################################################################### +PWD := @BINPWD@ # Set the project name to LLVM if its not defined ifndef PROJECT_NAME PROJECT_NAME := LLVM endif -PROJ_OBJ_DIR := $(shell pwd) -PROJ_OBJ_ROOT := $(subst //,/,$(shell cd $(PROJ_OBJ_DIR)/$(LEVEL); pwd)) +PROJ_OBJ_DIR := $(shell $(PWD)) +PROJ_OBJ_ROOT := $(shell cd $(PROJ_OBJ_DIR)/$(LEVEL); $(PWD)) ifeq ($(PROJECT_NAME),LLVM) -LLVM_SRC_ROOT := @abs_top_srcdir@ -LLVM_OBJ_ROOT := @abs_top_builddir@ -PROJ_SRC_ROOT := $(LLVM_SRC_ROOT) -PROJ_SRC_DIR := $(subst //,/,$(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR))) +LLVM_SRC_ROOT := $(shell cd @abs_top_srcdir@; $(PWD)) +LLVM_OBJ_ROOT := $(shell cd @abs_top_builddir@; $(PWD)) +PROJ_SRC_ROOT := $(shell cd $(LLVM_SRC_ROOT); $(PWD)) +PROJ_SRC_DIR := $(shell cd $(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD)) PROJ_prefix := @prefix@ PROJ_bindir := @prefix@/bin PROJ_libdir := @prefix@/lib @@ -72,7 +73,7 @@ endif ifndef LLVM_OBJ_ROOT $(error Projects must define LLVM_OBJ_ROOT) endif -PROJ_SRC_DIR := $(subst //,/,$(PROJ_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR))) +PROJ_SRC_DIR := $(shell cd $(PROJ_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD)) PROJ_prefix := $(PROJ_INSTALL_ROOT) PROJ_bindir := $(PROJ_INSTALL_ROOT)/bin PROJ_libdir := $(PROJ_INSTALL_ROOT)/lib |