diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-05 22:31:37 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-06 09:30:03 +0100 |
| commit | f2685df3b10e13f142736f28835e9064334bc143 (patch) | |
| tree | 45a0b279b01c1f50cdf6790b9e60bdaafa26799c /mk | |
| parent | 6ff98b962db15d18eb1d082fe344cef692ecef8e (diff) | |
| download | haskell-f2685df3b10e13f142736f28835e9064334bc143.tar.gz | |
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: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 4d5d82aa80..5e274bb71f 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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) |