[llvm-commits] [llvm] r127107 - in /llvm/trunk: Makefile.rules test/Makefile utils/llvm-lit/Makefile

[David Dean]

I suspect you need to revert 127079 as well for the matching changes to the tests.

On 5 Mar 2011, at 10:55 AM, Jakob Stoklund Olesen wrote:

> Author: stoklund
> Date: Sat Mar  5 12:55:06 2011
> New Revision: 127107
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=127107&view=rev
> Log:
> 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 ;-)
> 
> Modified:
>    llvm/trunk/Makefile.rules
>    llvm/trunk/test/Makefile
>    llvm/trunk/utils/llvm-lit/Makefile
> 
> Modified: llvm/trunk/Makefile.rules
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=127107&r1=127106&r2=127107&view=diff
> ==============================================================================
> --- llvm/trunk/Makefile.rules (original)
> +++ llvm/trunk/Makefile.rules Sat Mar  5 12:55:06 2011
> @@ -719,24 +719,6 @@
> 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
> ###############################################################################
> 
> Modified: llvm/trunk/test/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=127107&r1=127106&r2=127107&view=diff
> ==============================================================================
> --- llvm/trunk/test/Makefile (original)
> +++ llvm/trunk/test/Makefile Sat Mar  5 12:55:06 2011
> @@ -173,24 +173,22 @@
> 
> 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 > $@
> +
> 
> Modified: llvm/trunk/utils/llvm-lit/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-lit/Makefile?rev=127107&r1=127106&r2=127107&view=diff
> ==============================================================================
> --- llvm/trunk/utils/llvm-lit/Makefile (original)
> +++ llvm/trunk/utils/llvm-lit/Makefile Sat Mar  5 12:55:06 2011
> @@ -13,10 +13,9 @@
> 
> 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
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-David