[commit: nofib] master: Remove DEFAULT_TMPDIR (bed591d)

git at git.haskell.org git at git.haskell.org
Thu Sep 1 18:13:08 UTC 2016


Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bed591d4aa45c7b92a40985c72bc6b3daaa68f0d/nofib

>---------------------------------------------------------------

commit bed591d4aa45c7b92a40985c72bc6b3daaa68f0d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Aug 29 18:09:10 2016 -0400

    Remove DEFAULT_TMPDIR
    
    The logic for this was ripped out of GHC quite some time ago.


>---------------------------------------------------------------

bed591d4aa45c7b92a40985c72bc6b3daaa68f0d
 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 69cab3e..906cd0b 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 3762410..1dc8f6c 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 538dfa9..bab0ab4 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



More information about the ghc-commits mailing list