Merge pull request #10148 from haskell/bootstrap-no-arch-native

regenerate bootstrap files without arch-native
haskell · Jun 24, 2024 · 260ecdc · 260ecdc
2 parents 357bbf0 + aede6c4
commit 260ecdc
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json
@@ -267,7 +267,7 @@
             "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
             "component": "lib:hashable",
             "flags": [
-                "+arch-native",
+                "-arch-native",
                 "+integer-gmp",
                 "-random-initial-seed"
             ],

diff --git a/bootstrap/linux-9.2.8.json b/bootstrap/linux-9.2.8.json
@@ -237,7 +237,7 @@
             "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
             "component": "lib:hashable",
             "flags": [
-                "+arch-native",
+                "-arch-native",
                 "+integer-gmp",
                 "-random-initial-seed"
             ],

diff --git a/bootstrap/linux-9.4.8.json b/bootstrap/linux-9.4.8.json
@@ -227,7 +227,7 @@
             "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
             "component": "lib:hashable",
             "flags": [
-                "+arch-native",
+                "-arch-native",
                 "+integer-gmp",
                 "-random-initial-seed"
             ],

diff --git a/bootstrap/linux-9.6.4.json b/bootstrap/linux-9.6.4.json
@@ -197,7 +197,7 @@
             "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
             "component": "lib:hashable",
             "flags": [
-                "+arch-native",
+                "-arch-native",
                 "+integer-gmp",
                 "-random-initial-seed"
             ],

diff --git a/bootstrap/linux-9.8.2.json b/bootstrap/linux-9.8.2.json
@@ -201,7 +201,7 @@
             "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
             "component": "lib:hashable",
             "flags": [
-                "+arch-native",
+                "-arch-native",
                 "+integer-gmp",
                 "-random-initial-seed"
             ],

diff --git a/cabal.bootstrap.project b/cabal.bootstrap.project
@@ -8,4 +8,9 @@ packages:
 tests: False
 benchmarks: False
 
+-- This project file is used to generate bootstrap plans,
+-- as such we cannot enable "-march=native".
+constraints:
+  hashable -arch-native
+
 index-state: hackage.haskell.org 2024-06-17T00:00:01Z