From bed591d4aa45c7b92a40985c72bc6b3daaa68f0d Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 29 Aug 2016 18:09:10 -0400
Subject: [PATCH] Remove DEFAULT_TMPDIR
The logic for this was ripped out of GHC quite some time ago.
---
mk/boilerplate.mk | 1 -
runstdtest/Makefile | 1 -
runstdtest/runstdtest.prl | 5 ++---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 69cab3e3..906cd0bd 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -20,7 +20,6 @@ SIZE = size
STRIP = strip
PERL = /usr/bin/perl
CONTEXT_DIFF = diff -U 1
-DEFAULT_TMPDIR = /tmp
EXECUTABLE_FILE = chmod +x
# Benchmarks controls which set of tests should be run
diff --git a/runstdtest/Makefile b/runstdtest/Makefile
index 3762410f..1dc8f6c4 100644
--- a/runstdtest/Makefile
+++ b/runstdtest/Makefile
@@ -7,7 +7,6 @@ all::
$(RM) -f $(PROG)
echo '#!$(PERL)' >> $(PROG)
echo '$$RM = "$(RM)";' >> $(PROG)
- echo '$$DEFAULT_TMPDIR = "$(DEFAULT_TMPDIR)";' >> $(PROG)
echo '$$CONTEXT_DIFF = "$(CONTEXT_DIFF)";' >> $(PROG)
cat $(PROG).prl >> $(PROG)
$(EXECUTABLE_FILE) $(PROG)
diff --git a/runstdtest/runstdtest.prl b/runstdtest/runstdtest.prl
index 538dfa91..bab0ab46 100644
--- a/runstdtest/runstdtest.prl
+++ b/runstdtest/runstdtest.prl
@@ -2,7 +2,6 @@
# The perl script requires the following variables to be bound
# to something meaningful before it will operate correctly:
#
-# DEFAULT_TMPDIR
# CONTEXT_DIFF
# RM
#
@@ -53,8 +52,8 @@ $PgmStdinFile = '/dev/null';
if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
$TmpPrefix = $ENV{'TMPDIR'};
} else {
- $TmpPrefix ="$DEFAULT_TMPDIR";
- $ENV{'TMPDIR'} = "$DEFAULT_TMPDIR"; # set the env var as well
+ $TmpPrefix = '/tmp';
+ $ENV{'TMPDIR'} = '/tmp'; # set the env var as well
}
# If this is Cygwin, ignore eol and CR characters.
# Perhaps required for MSYS too, although the cygpath
--
GitLab