From 1b04e05cc8d4b2f44c3e996508da02d94293fe42 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 27 May 2024 13:08:23 +0800 Subject: [PATCH 1/8] Tell hadrian to use hashes in unit ids --- compiler/ghc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix index 9d92a3d008..7a24739adb 100644 --- a/compiler/ghc/default.nix +++ b/compiler/ghc/default.nix @@ -331,8 +331,10 @@ let # iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH # + lib.optionalString (targetPlatform.???) "'*.rts.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'" # For GHC versions in the 9.x range that don't support the +native_bignum flavour transformer yet - + lib.optionalString ((enableNativeBignum && !hadrianHasNativeBignumFlavour)) + + lib.optionalString (enableNativeBignum && !hadrianHasNativeBignumFlavour) " --bignum=native" + # Tell hadrian to hash the unit-ids + + lib.optionalString (builtins.compareVersions ghc-version "9.8" >= 0) " --hash-unit-ids" ; # When installation is done by copying the stage1 output the directory layout From 9a100aeb81d2fb1d5d8cdf947ec055639474db51 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 27 May 2024 13:08:36 +0800 Subject: [PATCH 2/8] Set ifdLevel to 1 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 705497df68..8b417d64bf 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 3; + ifdLevel = 0; compiler = "ghc928"; config = import ./config.nix; From f299a4d250ace12a7ada49605f8066a0fdefbacb Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 28 May 2024 10:47:35 +1200 Subject: [PATCH 3/8] ifdLevel 1 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8b417d64bf..74279b43d5 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 0; + ifdLevel = 1; compiler = "ghc928"; config = import ./config.nix; From 604b8210e0e57f2cb9a3ae31e077e40f685cb01b Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 28 May 2024 10:48:18 +1200 Subject: [PATCH 4/8] ifdLevel 2 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 74279b43d5..96cebe0352 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 1; + ifdLevel = 2; compiler = "ghc928"; config = import ./config.nix; From ba55f29498f4b78a07d5f8e31c828463867c2c1f Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 28 May 2024 11:59:21 +1200 Subject: [PATCH 5/8] ifdLevel 3 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 96cebe0352..705497df68 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 2; + ifdLevel = 3; compiler = "ghc928"; config = import ./config.nix; From b73fa2978a07f8ccdc00224ee7db3917bf06eba0 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sun, 9 Jun 2024 11:27:25 +1200 Subject: [PATCH 6/8] ifdLevel 1 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 705497df68..74279b43d5 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 3; + ifdLevel = 1; compiler = "ghc928"; config = import ./config.nix; From 418b10e4ac9ceac87f096fd93e35e42e4cfa2537 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sun, 9 Jun 2024 11:27:53 +1200 Subject: [PATCH 7/8] ifdLevel 2 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 74279b43d5..96cebe0352 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 1; + ifdLevel = 2; compiler = "ghc928"; config = import ./config.nix; From 6615843c4ffb5300e65ea9c96ced7061d15c35cd Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sun, 9 Jun 2024 11:35:48 +1200 Subject: [PATCH 8/8] ifdLevel 3 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 96cebe0352..705497df68 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ let callFlake = import flake-compat; - ifdLevel = 2; + ifdLevel = 3; compiler = "ghc928"; config = import ./config.nix;