[llvm-branch-commits] [clang-tools-extra-branch] r258345 - Merging r258327:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 20 15:02:50 2016
New Revision: 258345

URL: http://llvm.org/viewvc/llvm-project?rev=258345&view=rev
Log:
Merging r258327:
------------------------------------------------------------------------
r258327 | dim | 2016-01-20 10:53:44 -0800 (Wed, 20 Jan 2016) | 4 lines

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.

------------------------------------------------------------------------

Modified:
    clang-tools-extra/branches/release_38/   (props changed)
    clang-tools-extra/branches/release_38/test/Makefile   (contents, props changed)

Propchange: clang-tools-extra/branches/release_38/
------------------------------------------------------------------------------
    svn:mergeinfo = /clang-tools-extra/trunk:258327

Modified: clang-tools-extra/branches/release_38/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_38/test/Makefile?rev=258345&r1=258344&r2=258345&view=diff
==============================================================================
--- clang-tools-extra/branches/release_38/test/Makefile (original)
+++ clang-tools-extra/branches/release_38/test/Makefile Wed Jan 20 15:02:50 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

Propchange: clang-tools-extra/branches/release_38/test/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 15:02:50 2016
@@ -1,2 +1,3 @@
 /cfe/branches/type-system-rewrite/test/Makefile:134693-134817
 /cfe/trunk/test/SemaTemplate/test/Makefile:126920
+/clang-tools-extra/trunk/test/Makefile:258327