Skip to content

Commit 02669e0

Browse files
committed
*.project.* files use program-options to specify -fno-ignore-asserts
Simplifies *.project.* files a bit. It wasn't feasible before #7973, as program-options were applied to dependencies as well, which is undesirable.
1 parent a5106be commit 02669e0

5 files changed

+17
-56
lines changed

cabal.project

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,5 @@ constraints: these -assoc
2525
constraints: text >= 2.0
2626
constraints: time >= 1.12
2727

28-
-- So us hackers get all the assertion failures early:
29-
--
30-
-- NOTE: currently commented out, see
31-
-- https://github.com/haskell/cabal/issues/3911
32-
-- as a workaround we specify it for each package individually:
33-
--
34-
-- program-options
35-
-- ghc-options: -fno-ignore-asserts
36-
--
37-
package Cabal
38-
ghc-options: -fno-ignore-asserts
39-
40-
package cabal-testsuite
41-
ghc-options: -fno-ignore-asserts
42-
43-
package Cabal-QuickCheck
44-
ghc-options: -fno-ignore-asserts
45-
46-
package Cabal-tree-diff
47-
ghc-options: -fno-ignore-asserts
48-
49-
package Cabal-described
50-
ghc-options: -fno-ignore-asserts
51-
52-
package cabal-install-solver
53-
ghc-options: -fno-ignore-asserts
54-
55-
package cabal-install
28+
program-options
5629
ghc-options: -fno-ignore-asserts

cabal.project.coverage

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ allow-newer: windns-0.1.0.1:base
2828
constraints: rere -rere-cfg
2929
constraints: these
3030

31+
program-options
32+
ghc-options: -fno-ignore-asserts
33+
3134
-- NOTE: for library coverage in multi-project builds,
3235
-- see:
3336
--
@@ -39,41 +42,33 @@ constraints: these
3942
-- the `cabal-install` library
4043
--
4144
package Cabal-syntax
42-
ghc-options: -fno-ignore-asserts
4345
coverage: False
4446
library-coverage: False
4547

4648
package Cabal
47-
ghc-options: -fno-ignore-asserts
4849
coverage: False
4950
library-coverage: False
5051

5152
package cabal-testsuite
52-
ghc-options: -fno-ignore-asserts
5353
coverage: False
5454
library-coverage: False
5555

5656
package Cabal-QuickCheck
57-
ghc-options: -fno-ignore-asserts
5857
coverage: False
5958
library-coverage: False
6059

6160
package Cabal-tree-diff
62-
ghc-options: -fno-ignore-asserts
6361
coverage: False
6462
library-coverage: False
6563

6664
package Cabal-described
67-
ghc-options: -fno-ignore-asserts
6865
coverage: False
6966
library-coverage: False
7067

7168
package cabal-install-solver
72-
ghc-options: -fno-ignore-asserts
7369
coverage: False
7470
library-coverage: False
7571

7672
package cabal-install
77-
ghc-options: -fno-ignore-asserts
7873
coverage: True
7974
library-coverage: True

cabal.project.libonly

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,4 @@ tests: True
1111
--optional-packages: */
1212

1313
program-options
14-
-- So us hackers get all the assertion failures early:
15-
--
16-
-- NOTE: currently commented out, see
17-
-- https://github.com/haskell/cabal/issues/3911
18-
--
19-
-- ghc-options: -fno-ignore-asserts
20-
--
21-
-- as a workaround we specify it for each package individually:
22-
package Cabal-syntax
23-
ghc-options: -fno-ignore-asserts
24-
package Cabal
25-
ghc-options: -fno-ignore-asserts
26-
package cabal-testsuite
2714
ghc-options: -fno-ignore-asserts

cabal.project.validate

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ constraints: these -assoc
1919

2020
write-ghc-environment-files: never
2121

22+
program-options
23+
ghc-options: -fno-ignore-asserts
24+
2225
package Cabal-syntax
23-
ghc-options: -Werror -fno-ignore-asserts
26+
ghc-options: -Werror
2427
package Cabal
25-
ghc-options: -Werror -fno-ignore-asserts
28+
ghc-options: -Werror
2629
package cabal-testsuite
27-
ghc-options: -Werror -fno-ignore-asserts
30+
ghc-options: -Werror
2831
package cabal-install
29-
ghc-options: -Werror -fno-ignore-asserts
32+
ghc-options: -Werror

cabal.project.validate.libonly

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ write-ghc-environment-files: never
1414
constraints: rere -rere-cfg
1515
constraints: these -assoc
1616

17+
program-options
18+
ghc-options: -fno-ignore-asserts
19+
1720
package Cabal-syntax
18-
ghc-options: -Werror -fno-ignore-asserts
21+
ghc-options: -Werror
1922
package Cabal
20-
ghc-options: -Werror -fno-ignore-asserts
23+
ghc-options: -Werror
2124
package cabal-testsuite
22-
ghc-options: -Werror -fno-ignore-asserts
25+
ghc-options: -Werror
2326

2427
-- https://github.com/haskell-hvr/cryptohash-sha256/issues/12
2528
allow-newer: cryptohash-sha256:base

0 commit comments

Comments
 (0)