[clang-tools-extra] r258327 - Ensure the lit.site.cfg and Unit/lit.site.cfg make targets do not use

[Jonathan Roelofs via cfe-commits]

On 1/20/16 11:53 AM, Dimitry Andric via cfe-commits wrote:
> Author: dim
> Date: Wed Jan 20 12:53:44 2016
> New Revision: 258327
>
> URL: http://llvm.org/viewvc/llvm-project?rev=258327&view=rev
> Log:
> Ensure the lit.site.cfg and Unit/lit.site.cfg make targets do not use
> the same temporary file, otherwise there is a race condition when using
> parallel make jobs.

Seems this should go in 3.8... hans, alexfh?


Jon

>
> Modified:
>      clang-tools-extra/trunk/test/Makefile
>
> Modified: clang-tools-extra/trunk/test/Makefile
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/Makefile?rev=258327&r1=258326&r2=258327&view=diff
> ==============================================================================
> --- clang-tools-extra/trunk/test/Makefile (original)
> +++ clang-tools-extra/trunk/test/Makefile Wed Jan 20 12:53:44 2016
> @@ -60,12 +60,12 @@ lit.site.cfg: FORCE
>   Unit/lit.site.cfg: FORCE
>   	@echo "Making Unit/lit.site.cfg for Clang extra tools..."
>   	@$(MKDIR) $(dir $@)
> -	@$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp
> -	@$(ECHOPATH) s=@CLANG_TOOLS_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp
> -	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
> -	@$(ECHOPATH) s=@CLANG_TOOLS_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
> -	@sed -f lit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
> -	@-rm -f lit.tmp
> +	@$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> unit.tmp
> +	@$(ECHOPATH) s=@CLANG_TOOLS_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp
> +	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> unit.tmp
> +	@$(ECHOPATH) s=@CLANG_TOOLS_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp
> +	@sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
> +	@-rm -f unit.tmp
>
>   clean::
>   	@ find . -name Output | xargs rm -fr
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>

-- 
Jon Roelofs
jonathan at codesourcery.com
CodeSourcery / Mentor Embedded