summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dimitry@andric.com>2016-01-20 18:53:44 +0000
committerDimitry Andric <dimitry@andric.com>2016-01-20 18:53:44 +0000
commitd325ab8cb885bcfed80b51ea4d5748c4e58edb7f (patch)
tree4c38728a45e0e714c4215dfc7e770145070b2f09
parentbd2dc67142a1861b89e8a9752f9fb407afcf7b07 (diff)
downloadbcm5719-llvm-d325ab8cb885bcfed80b51ea4d5748c4e58edb7f.tar.gz
bcm5719-llvm-d325ab8cb885bcfed80b51ea4d5748c4e58edb7f.zip
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. llvm-svn: 258327
-rw-r--r--clang-tools-extra/test/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/clang-tools-extra/test/Makefile b/clang-tools-extra/test/Makefile
index 74d0e6fb745..a1e3b5c99df 100644
--- a/clang-tools-extra/test/Makefile
+++ b/clang-tools-extra/test/Makefile
@@ -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
OpenPOWER on IntegriCloud