[Git][ghc/ghc][cherry-pick-36d38047] 2 commits: Bump hpc submodule

[Ben Gamari]

Ben Gamari pushed to branch cherry-pick-36d38047 at Glasgow Haskell Compiler / GHC


Commits:
6e254ee3 by Ryan Scott at 2019-04-12T15:23:33Z
Bump hpc submodule

Currently, the `hpc` submodule is pinned against the `wip/final-mfp`
branch, not against `master`. This pins it back against `master`.

- - - - -
6c1e1beb by Ben Gamari at 2019-04-13T13:36:53Z
users-guide: Document how to disable package environments

As noted in #16309 this somehow went undocumented.


(cherry picked from commit 36d380475d9056fdf93305985be3def00aaf6cf7)
- - - - -


2 changed files:

- docs/users_guide/packages.rst
- libraries/hpc


Changes:

=====================================
docs/users_guide/packages.rst
=====================================
@@ -579,6 +579,12 @@ must be relative to the location of the package environment file.
 
     Use the package environment in ⟨file⟩, or in
     ``$HOME/.ghc/arch-os-version/environments/⟨name⟩``
+    If set to ``-`` no package environment is read.
+
+.. envvar:: GHC_ENVIRONMENT
+
+    Specifies the path to the package environment file to be used by GHC.
+    Overridden by the :ghc-flag:`-package-env ⟨file⟩|⟨name⟩` flag if set.
 
 In order, ``ghc`` will look for the package environment in the following
 locations:
@@ -588,11 +594,11 @@ locations:
 -  File ``$HOME/.ghc/arch-os-version/environments/name`` if you pass the
    option ``-package-env ⟨name⟩``.
 
--  File ⟨file⟩ if the environment variable ``GHC_ENVIRONMENT`` is set to
+-  File ⟨file⟩ if the environment variable :envvar:`GHC_ENVIRONMENT` is set to
    ⟨file⟩.
 
 -  File ``$HOME/.ghc/arch-os-version/environments/name`` if the
-   environment variable ``GHC_ENVIRONMENT`` is set to ⟨name⟩.
+   environment variable :envvar:`GHC_ENVIRONMENT` is set to ⟨name⟩.
 
 Additionally, unless ``-hide-all-packages`` is specified ``ghc`` will also
 look for the package environment in the following locations:


=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 7673420558e2a54affe530911d555cc78577ad87
+Subproject commit 42bb0059dc535948ce87b846611968c1c01ae049



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/29d530a1a97d0887d4dd0939f5da27bae4382c19...6c1e1beb78c559bf88b658b3b118ead46c85579b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/29d530a1a97d0887d4dd0939f5da27bae4382c19...6c1e1beb78c559bf88b658b3b118ead46c85579b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190413/d7e4a444/attachment-0001.html>