about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Kadel <richkadel@google.com>2020-12-03 12:00:33 -0800
committerRich Kadel <richkadel@google.com>2020-12-03 12:00:33 -0800
commitdc4bd9067eda1df118fc48cb6b828d72e916e1bb (patch)
treee1f92131459fbbb57d3893ae04986881b10aa9a1
parentf101fd8ff62431927d19c70a06a68483cce37c1f (diff)
downloadrust-dc4bd9067eda1df118fc48cb6b828d72e916e1bb.tar.gz
rust-dc4bd9067eda1df118fc48cb6b828d72e916e1bb.zip
Tweak to Makefile to overcome MacOS make corruption bug
-rw-r--r--src/test/run-make-fulldeps/coverage-reports/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/test/run-make-fulldeps/coverage-reports/Makefile b/src/test/run-make-fulldeps/coverage-reports/Makefile
index 89d5974d73c..302f09ae422 100644
--- a/src/test/run-make-fulldeps/coverage-reports/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports/Makefile
@@ -87,20 +87,14 @@ endif
 %: $(SOURCEDIR)/lib/%.rs
 	# Compile the test library with coverage instrumentation
 	$(RUSTC) $(SOURCEDIR)/lib/$@.rs \
-			$$( grep -q '^\/\/ require-rust-edition-2018' $(SOURCEDIR)/lib/$@.rs && \
-				echo "--edition=2018" \
-			) \
-			--crate-type rlib \
-			-Zinstrument-coverage
+			$$( grep -q '^\/\/ require-rust-edition-2018' $(SOURCEDIR)/lib/$@.rs && echo "--edition=2018" ) \
+			--crate-type rlib -Zinstrument-coverage
 
 %: $(SOURCEDIR)/%.rs
 	# Compile the test program with coverage instrumentation
 	$(RUSTC) $(SOURCEDIR)/$@.rs \
-			$$( grep -q '^\/\/ require-rust-edition-2018' $(SOURCEDIR)/$@.rs && \
-				echo "--edition=2018" \
-			) \
-			-L "$(TMPDIR)" \
-			-Zinstrument-coverage
+			$$( grep -q '^\/\/ require-rust-edition-2018' $(SOURCEDIR)/$@.rs && echo "--edition=2018" ) \
+			-L "$(TMPDIR)" -Zinstrument-coverage
 
 	# Run it in order to generate some profiling data,
 	# with `LLVM_PROFILE_FILE=<profdata_file>` environment variable set to