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

[Bill Wendling]

On Mar 5, 2011, at 1:46 AM, NAKAMURA Takumi wrote:

> Author: chapuni
> Date: Sat Mar  5 03:46:45 2011
> New Revision: 127073
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=127073&view=rev
> Log:
> Introduce $(ECHOPATH) to print DOSish path string on MSYS bash for alternative of $(ECHO).
> 
> On mingw and python/w32, lit would not be expected to understand MSYS-style path.
> 
Hi Nakamura,

It doesn't look like this patch works:

	http://google1.osuosl.org:8011/builders/llvm-gcc-native-mingw32/builds/983

Could you investigate please?

-bw

> Modified:
>    llvm/trunk/Makefile.rules
>    llvm/trunk/test/Makefile
>    llvm/trunk/utils/llvm-lit/Makefile
> 
> Modified: llvm/trunk/test/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=127073&r1=127072&r2=127073&view=diff
> ==============================================================================
> --- llvm/trunk/test/Makefile (original)
> +++ llvm/trunk/test/Makefile Sat Mar  5 03:46:45 2011
> @@ -173,22 +173,24 @@
> 
> lit.site.cfg: site.exp
> 	@echo "Making LLVM 'lit.site.cfg' file..."
> -	@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 > $@
> +	@$(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
> 
> Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
> 	@echo "Making LLVM unittest 'lit.site.cfg' file..."
> -	@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 > $@
> -
> +	@$(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
> 
> Modified: llvm/trunk/utils/llvm-lit/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-lit/Makefile?rev=127073&r1=127072&r2=127073&view=diff
> ==============================================================================
> --- llvm/trunk/utils/llvm-lit/Makefile (original)
> +++ llvm/trunk/utils/llvm-lit/Makefile Sat Mar  5 03:46:45 2011
> @@ -13,9 +13,10 @@
> 
> all:: $(ToolDir)/llvm-lit
> 
> -$(ToolDir)/llvm-lit: llvm-lit.in $(ToolDir)/.dir
> +$(ToolDir)/llvm-lit: llvm-lit.in Makefile $(ToolDir)/.dir
> 	$(Echo) "Creating 'llvm-lit' script..."
> -	$(Verb)sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
> -	     -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
> -	     $< > $@
> +	$(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)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