Commit f2685df3 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

avoid $(CrossCompilerPrefix) for stage2 install

Suppose we are crossbuilding ghc (when ghc-stage2
is a normal compiler for $target):

For this case 'make install' should install unprefixed
stage2 'ghc' and not '$(CorssCompilePrefix)-ghc'.

That way cross-built ghc is installable and
usable on target as if it would be built natively
on a target.
Signed-off-by: default avatarSergei Trofimovich <>
parent 6ff98b96
......@@ -530,7 +530,7 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@
# needs to know which gcc you're using in order to perform its tests.
GccVersion = @GccVersion@
CrossCompilePrefix = @CrossCompilePrefix@
# TargetPlatformFull retains the string passed to configure so we have it in
# the necessary format to pass to libffi's configure.
TargetPlatformFull = @TargetPlatformFull@
......@@ -567,6 +567,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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment