summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/users_guide/separate_compilation.rst4
-rw-r--r--mk/config.mk.in15
m---------nofib0
3 files changed, 0 insertions, 19 deletions
diff --git a/docs/users_guide/separate_compilation.rst b/docs/users_guide/separate_compilation.rst
index e83cd8e6aa..aa99c98f79 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 56a63fd4d5..2163643c58 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -396,21 +396,6 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64),@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
-Subproject 6dc2b467c71cf7c7e8f99ba4e60ca4b32a90236
+Subproject bed591d4aa45c7b92a40985c72bc6b3daaa68f0