From d6ad31de331c59267de34940fc95ac4bf7eb7841 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 30 Nov 2024 11:26:38 +1300 Subject: [PATCH] Better fix? --- compiler/ghc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix index 29b05841e..e24dafd7c 100644 --- a/compiler/ghc/default.nix +++ b/compiler/ghc/default.nix @@ -348,9 +348,9 @@ let + lib.optionalString (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) " '*.*.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'" + lib.optionalString (targetPlatform.isAndroid && targetPlatform.isAarch32) - " '*.*.ghc.c.opts += -optc-march=armv7-a -optc-mfloat-abi=softfp -optc-mfpu=vfpv3-d16'" + " 'stage1.*.ghc.c.opts += -optc-march=armv7-a -optc-mfloat-abi=softfp -optc-mfpu=vfpv3-d16'" + lib.optionalString (targetPlatform.isAndroid && targetPlatform.isAarch64) - " '*.*.ghc.c.opts += -optc-march=armv8-a'" + " 'stage1.*.ghc.c.opts += -optc-march=armv8-a'" # For GHC versions in the 9.x range that don't support the +native_bignum flavour transformer yet + lib.optionalString ((enableNativeBignum && !hadrianHasNativeBignumFlavour)) " --bignum=native"