Skip to content

Commit

Permalink
Unbreak aarch64-linux-musl-cross
Browse files Browse the repository at this point in the history
When compiling linux -> linux, but different arch, we _are_ building a cross compiler. Only for same arch we can pretend it's a stage2 compiler.
  • Loading branch information
angerman authored Nov 22, 2023
1 parent 4d0b524 commit fc060cf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/ghc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ stdenv.mkDerivation (rec {
--replace 'dynamic-library-dirs:' 'dynamic-library-dirs: ${libcxx}/lib ${libcxxabi}/lib'
find . -name 'system*.conf*'
cat mk/system-cxx-std-lib-1.0.conf
'' + lib.optionalString (installStage1 && stdenv.targetPlatform.isMusl) ''
'' + lib.optionalString (installStage1 && !haskell-nix.haskellLib.isCrossTarget && stdenv.targetPlatform.isMusl) ''
substituteInPlace hadrian/cfg/system.config \
--replace 'cross-compiling = YES' \
'cross-compiling = NO'
Expand Down

0 comments on commit fc060cf

Please sign in to comment.