[commit: ghc] master: Kill vestiages of DEFAULT_TMPDIR (1e39c29)

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


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1e39c29ab55b9df83df142ad50e7a79e22f47f9e/ghc

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

commit 1e39c29ab55b9df83df142ad50e7a79e22f47f9e
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Sep 1 12:13:18 2016 -0400

    Kill vestiages of DEFAULT_TMPDIR
    
    It was removed long ago in cf403b50900648063d99afa160d2091a7d6f58c1.
    Thanks for @rwbarton for catching this.
    
    Updates nofib submodule.
    
    Test Plan: Validate
    
    Reviewers: austin, rwbarton
    
    Subscribers: thomie, rwbarton
    
    Differential Revision: https://phabricator.haskell.org/D2493
    
    GHC Trac Issues: #12443


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

1e39c29ab55b9df83df142ad50e7a79e22f47f9e
 docs/users_guide/separate_compilation.rst |  4 ----
 mk/config.mk.in                           | 15 ---------------
 nofib                                     |  2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/docs/users_guide/separate_compilation.rst b/docs/users_guide/separate_compilation.rst
index e83cd8e..aa99c98 100644
--- a/docs/users_guide/separate_compilation.rst
+++ b/docs/users_guide/separate_compilation.rst
@@ -405,10 +405,6 @@ Redirecting temporary files
     name of the directory where temporary files should be put. GCC and other
     programs will honour the :envvar:`TMPDIR` variable as well.
 
-    Even better idea: Set the :envvar:`DEFAULT_TMPDIR` :command:`make` variable when
-    building GHC, and never worry about :envvar:`TMPDIR` again. (see the build
-    documentation).
-
 .. _hi-options:
 
 Other options related to interface files
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 56a63fd..2163643 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -396,21 +396,6 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64), at UseLibdw@,
 #
 ################################################################################
 
-# Directory used by GHC (and possibly other tools) for storing
-# temporary files.  If your TMPDIR isn't big enough, either override
-# this in build.mk or set your environment variable "TMPDIR" to point
-# to somewhere with more space.  (TMPDIR=. is a good choice).
-
-# DEFAULT_TMPDIR isn't called TMPDIR because GNU make tends to
-# override an environment variable with the value of the make variable
-# of the same name (if it exists) when executing sub-processes, so
-# setting the TMPDIR env var would have no effect in the build tree.
-
-DEFAULT_TMPDIR		= /tmp
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-DEFAULT_TMPDIR		= /C/TEMP
-endif
-
 BIN_DIST_NAME         = ghc-$(ProjectVersion)
 BIN_DIST_PREP_DIR     = bindistprep/$(BIN_DIST_NAME)
 BIN_DIST_PREP_TAR     = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
diff --git a/nofib b/nofib
index 6dc2b46..bed591d 160000
--- a/nofib
+++ b/nofib
@@ -1 +1 @@
-Subproject commit 6dc2b467c71cf7c7e8f99ba4e60ca4b32a90236a
+Subproject commit bed591d4aa45c7b92a40985c72bc6b3daaa68f0d



More information about the ghc-commits mailing list