[commit: ghc] ghc-8.2: config.mk.in: Add bzip, gzip, and xz executable names to be overridden (efa9f0f)

git at git.haskell.org git at git.haskell.org
Mon Mar 27 03:00:05 UTC 2017


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

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

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

commit efa9f0fe55f6f9349a20b80b643b6ecdc50bc12a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Mar 23 20:59:21 2017 -0400

    config.mk.in: Add bzip, gzip, and xz executable names to be overridden
    
    Reviewers: austin, hvr, erikd
    
    Reviewed By: erikd
    
    Subscribers: rwbarton, thomie, erikd, snowleopard
    
    Differential Revision: https://phabricator.haskell.org/D3367
    
    (cherry picked from commit 1b374402a7a078e53c3e00eb0460e8b22930c453)


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

efa9f0fe55f6f9349a20b80b643b6ecdc50bc12a
 configure.ac    | 5 +++++
 mk/config.mk.in | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 496cd05..af62bd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -702,6 +702,11 @@ dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar)
 
+dnl ** check for compressors
+AC_PATH_PROGS(Bzip2Cmd,bzip2, bzip2)
+AC_PATH_PROGS(GzipCmd,gzip, gzip)
+AC_PATH_PROGS(XzCmd,pxz xz, xz)
+
 dnl ** check for patch
 dnl if GNU patch is named gpatch, look for it first
 AC_PATH_PROGS(PatchCmd,gpatch patch, patch)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 729abfa..4e61eea 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -789,9 +789,9 @@ STRIP_CMD      = strip
 endif
 PATCH_CMD      = @PatchCmd@
 TAR_CMD        = @TarCmd@
-BZIP2_CMD      = bzip2
-GZIP_CMD       = gzip
-XZ_CMD         = xz
+BZIP2_CMD      = @Bzip2Cmd@
+GZIP_CMD       = @GzipCmd@
+XZ_CMD         = @XzCmd@
 
 # xz is default compression
 TAR_COMP      ?= xz



More information about the ghc-commits mailing list