diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-09-01 12:13:18 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-09-01 14:12:22 -0400 |
| commit | 1e39c29ab55b9df83df142ad50e7a79e22f47f9e (patch) | |
| tree | 99f4e3c5e556de48cbc596aabc7f10275567266f | |
| parent | a48de37dcca98e7d477040b0ed298bcd1b3ab303 (diff) | |
| download | haskell-1e39c29ab55b9df83df142ad50e7a79e22f47f9e.tar.gz | |
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
| -rw-r--r-- | docs/users_guide/separate_compilation.rst | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 15 | ||||
| m--------- | nofib | 0 |
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 |