about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Kadel <richkadel@google.com>2021-02-13 00:14:50 -0800
committerRich Kadel <richkadel@google.com>2021-02-13 00:14:50 -0800
commitcbe6c70c687c97a0189cc2ccf2d3071f4ed01174 (patch)
tree66d54333e657a347b26bbea790cc3ef406bd6d31
parentb211acf68358fc109d1ee36fa4a22f3e017dec91 (diff)
downloadrust-cbe6c70c687c97a0189cc2ccf2d3071f4ed01174.tar.gz
rust-cbe6c70c687c97a0189cc2ccf2d3071f4ed01174.zip
Disabled SHELL=dash on Windows due to invalid path backslash handling
Calling an executable via full path with Windows backslashes fails in
dash.
-rw-r--r--src/test/run-make-fulldeps/tools.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-make-fulldeps/tools.mk b/src/test/run-make-fulldeps/tools.mk
index 83f640e2f40..a1a076dd747 100644
--- a/src/test/run-make-fulldeps/tools.mk
+++ b/src/test/run-make-fulldeps/tools.mk
@@ -30,9 +30,11 @@ DIFF := diff -u --strip-trailing-cr
 # whenever possible. Most developer platforms include `/bin/dash`, but to ensure
 # tests still work when `/bin/dash`, if not available, this `SHELL` override is
 # conditional:
+ifndef IS_WINDOWS # dash interprets backslashes in executable paths incorrectly
 ifneq (,$(wildcard /bin/dash))
 SHELL := /bin/dash
 endif
+endif
 
 # This is the name of the binary we will generate and run; use this
 # e.g. for `$(CC) -o $(RUN_BINFILE)`.