From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Tue, 6 Feb 2018 21:01:18 +0000 (+0000)
Subject: avoid-CrossCompilerPrefix-stage2
X-Git-Tag: archive/raspbian/8.0.2-11+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b04af84b686942bc3a57c9bf19012cf58e7eb80;p=ghc.git

avoid-CrossCompilerPrefix-stage2


Gbp-Pq: Name avoid-CrossCompilerPrefix-stage2.patch
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index bfaaa660..c736611f 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -518,11 +518,6 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@
 
 WhatGccIsCalled       = @WhatGccIsCalled@
 GccVersion            = @GccVersion@
-ifeq "$(phase)" "0"
-CrossCompilePrefix    =
-else
-CrossCompilePrefix    = @CrossCompilePrefix@
-endif
 # TargetPlatformFull retains the string passed to configure so we have it in
 # the necessary format to pass to libffi's configure.
 TargetPlatformFull    = @TargetPlatformFull@
@@ -557,6 +552,11 @@ CrossCompiling        = @CrossCompiling@
 # See Note [Stage1Only vs stage=1]
 Stage1Only = NO
 
+# Installed tools prefix:
+#    we add prefix to crosscompiler GHC only (ghc-stage1),
+#    not cross-built GHC (not ghc-stage2).
+CrossCompilePrefix    = $(if $(filter YES,$(Stage1Only)),@CrossCompilePrefix@,)
+
 # Install stage 2 by default, or stage 1 in the cross compiler
 # case. Can be changed to 3
 INSTALL_GHC_STAGE= $(if $(filter YES,$(Stage1Only)),1,2)