[commit: ghc] ghc-8.2: ghc.mk: Ensure that ghc-pkg path is quoted (c5a4b7c)

git at git.haskell.org git at git.haskell.org
Wed Jul 19 23:23:53 UTC 2017


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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/c5a4b7c7e8e15fd6f26f54348473701190383e4f/ghc

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

commit c5a4b7c7e8e15fd6f26f54348473701190383e4f
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Jun 2 13:15:52 2017 -0400

    ghc.mk: Ensure that ghc-pkg path is quoted
    
    Otherwise this will fail if the prefix path contains spaces. Thanks to
    marinelli for pointing this out.
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3604
    
    (cherry picked from commit ff363bd74c8b2505b92b39d5fedcf95b8ab7365a)


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

c5a4b7c7e8e15fd6f26f54348473701190383e4f
 ghc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 004ac4a..0466164 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1020,7 +1020,7 @@ install_packages: rts/dist/package.conf.install
 
 # Finally, update package.cache to ensure it's newer than the registration
 # files. This avoids #13375.
-	$(INSTALLED_GHC_PKG_REAL) --global-package-db "$(INSTALLED_PACKAGE_CONF)" recache
+	"$(INSTALLED_GHC_PKG_REAL)" --global-package-db "$(INSTALLED_PACKAGE_CONF)" recache
 
 # -----------------------------------------------------------------------------
 # Binary distributions



More information about the ghc-commits mailing list