diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-03-05 18:55:06 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-03-05 18:55:06 +0000 |
| commit | 7cefa640de1d3ab8cdfe6062811190a6fd33e684 (patch) | |
| tree | d3a82ef518d9e8b47eb135aa4943f4369c8c595a | |
| parent | e516379d2a2fd1ad7583b2fa289051da517d8a42 (diff) | |
Revert r127073: "Introduce $(ECHOPATH) to print DOSish path string on MSYS bash for alternative of $(ECHO)."
It broke the llvm-gcc-native-mingw32 buildbot, and we need all of them to be green for the 2.9 branch.
Takumi, please reapply after we branch, preferably with a fix ;-)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127107 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 18 | ||||
| -rw-r--r-- | test/Makefile | 34 | ||||
| -rw-r--r-- | utils/llvm-lit/Makefile | 9 |
3 files changed, 20 insertions, 41 deletions
diff --git a/Makefile.rules b/Makefile.rules index 01d53f1934..c0a9112c31 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -719,24 +719,6 @@ BaseNameSources := $(sort $(basename $(Sources))) ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) -#---------------------------------------------------------- -# For Mingw MSYS bash and Python/w32: -# -# $(ECHOPATH) prints DOSish pathstring. -# ex) $(ECHOPATH) /include/sys/types.h -# --> C:/mingw/include/sys/types.h -# built-in "echo" does not transform path to DOSish path. -# -# FIXME: It would not be needed when MSYS's python -# were provided. -#---------------------------------------------------------- - -ifeq (-mingw32,$(findstring -mingw32,$(BUILD_TRIPLE))) - ECHOPATH := $(Verb)python -c "import sys;print ' '.join(sys.argv[1:])" -else - ECHOPATH := $(Verb)$(ECHO) -endif - ############################################################################### # DIRECTORIES: Handle recursive descent of directory structure ############################################################################### diff --git a/test/Makefile b/test/Makefile index 0d84186b1e..b37bbfcc6f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -173,24 +173,22 @@ site.exp: FORCE lit.site.cfg: site.exp @echo "Making LLVM 'lit.site.cfg' file..." - @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp - @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp - @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp - @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp - @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp - @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp - @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ - @-rm -f lit.tmp + @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \ + -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \ + -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \ + -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \ + -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \ + $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE @echo "Making LLVM unittest 'lit.site.cfg' file..." - @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > unit.tmp - @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> unit.tmp - @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp - @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> unit.tmp - @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp - @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp - @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp - @$(ECHOPATH) s=@SHLIBPATH_VAR@=$(SHLIBPATH_VAR)=g >> unit.tmp - @sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@ - @-rm -f unit.tmp + @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \ + -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \ + -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \ + -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \ + -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \ + -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \ + -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \ + -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \ + $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@ + diff --git a/utils/llvm-lit/Makefile b/utils/llvm-lit/Makefile index 77021bbc24..702591f495 100644 --- a/utils/llvm-lit/Makefile +++ b/utils/llvm-lit/Makefile @@ -13,10 +13,9 @@ include $(LEVEL)/Makefile.common all:: $(ToolDir)/llvm-lit -$(ToolDir)/llvm-lit: llvm-lit.in Makefile $(ToolDir)/.dir +$(ToolDir)/llvm-lit: llvm-lit.in $(ToolDir)/.dir $(Echo) "Creating 'llvm-lit' script..." - $(Verb)$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp - $(Verb)$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp - $(Verb)sed -f lit.tmp $< > $@ + $(Verb)sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \ + -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \ + $< > $@ $(Verb)chmod +x $@ - $(Verb)rm -f lit.tmp |