[commit: ghc] ghc-8.2: ghc.mk: fix 'make install' for cross-mingw32 (c82add7)

git at git.haskell.org git at git.haskell.org
Thu Apr 27 20:10:10 UTC 2017


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

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

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

commit c82add780b048943b3fac9a096eb2aaf838cc10a
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sun Apr 23 15:31:13 2017 +0100

    ghc.mk: fix 'make install' for cross-mingw32
    
    Attempt to install cross-compiled mingw32 GHC built on linux failed as:
    
        $ make install DESTDIR=$(pwd)/__i__
    
        "mv" "$(pwd)/__i__/usr/local/lib/ghc-8.3.20170422/bin/ghc-stage2" \
             "$(pwd)/__i__/usr/local/lib/ghc-8.3.20170422/bin/ghc"
        mv: failed to stat
             '$(pwd)/__i__/usr/local/lib/ghc-8.3.20170422/bin/ghc-stage2': \
             No such file or directory
    
    The rename should not be performed for windows targets.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit 74e5ec9e63ff40bb8d52041cdc2f602d9bf12eb8)


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

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

diff --git a/ghc.mk b/ghc.mk
index caa6c38..813b3f5 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -924,7 +924,7 @@ ifneq "$(INSTALL_LIBEXECS)" ""
 	done
 # We rename ghc-stage2, so that the right program name is used in error
 # messages etc.
-ifeq "$(Windows_Host)" "NO"
+ifeq "$(Windows_Target)" "NO"
 	"$(MV)" "$(DESTDIR)$(ghclibexecdir)/bin/ghc-stage$(INSTALL_GHC_STAGE)" "$(DESTDIR)$(ghclibexecdir)/bin/ghc"
 endif
 endif



More information about the ghc-commits mailing list