Skip to content

Commit 3a04d56

Browse files
committed
Disable backend-only packages for wasm32 target
Extend existing arch(javascript) buildable guards to also cover arch(wasm32), and add missing guards to executables (ob, obelisk-asset-manifest-generate, obelisk-asset-th-generate, obelisk-selftest) that cannot be built for non-native targets
1 parent c076781 commit 3a04d56

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

lib/asset/manifest/obelisk-asset-manifest.cabal

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ library
4040
-Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
4141
-fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
4242

43-
if arch(javascript)
43+
if arch(javascript) || arch(wasm32)
4444
buildable: False
4545

4646
executable obelisk-asset-manifest-generate
@@ -52,6 +52,9 @@ executable obelisk-asset-manifest-generate
5252
, obelisk-asset-manifest
5353
, text
5454

55+
if arch(javascript) || arch(wasm32)
56+
buildable: False
57+
5558
executable obelisk-asset-th-generate
5659
default-language: Haskell2010
5760
hs-source-dirs: src-bin
@@ -61,3 +64,6 @@ executable obelisk-asset-th-generate
6164
, obelisk-asset-manifest
6265
, filepath
6366
, text
67+
68+
if arch(javascript) || arch(wasm32)
69+
buildable: False

lib/asset/serve-snap/obelisk-asset-serve-snap.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ library
3434
-Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
3535
-fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
3636

37-
if arch(javascript)
37+
if arch(javascript) || arch(wasm32)
3838
buildable: False

lib/backend/obelisk-backend.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ library
2929
exposed-modules: Obelisk.Backend
3030
ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
3131

32-
if arch(javascript)
32+
if arch(javascript) || arch(wasm32)
3333
buildable: False

lib/command/obelisk-command.cabal

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,13 @@ library
6969
Obelisk.Command.Preprocessor
7070
ghc-options: -Wall
7171

72-
if arch(javascript)
72+
if arch(javascript) || arch(wasm32)
7373
buildable: False
7474

7575
executable ob
7676
main-is: src-bin/ob.hs
7777
build-depends: base, obelisk-command
7878
ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -threaded
79+
80+
if arch(javascript) || arch(wasm32)
81+
buildable: False

lib/run/obelisk-run.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@ library
5252
if os(linux)
5353
cpp-options: -DIPROUTE_SUPPORTED
5454
build-depends: which
55-
if arch(javascript)
55+
56+
if arch(javascript) || arch(wasm32)
5657
buildable: False

lib/selftest/obelisk-selftest.cabal

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ library
2929
exposed-modules:
3030
Obelisk.SelfTest
3131
ghc-options: -Wall
32-
if arch(javascript)
32+
if arch(javascript) || arch(wasm32)
3333
buildable: False
3434

3535
executable obelisk-selftest
3636
main-is: src-bin/obelisk-selftest.hs
3737
build-depends: base, obelisk-selftest
3838
ghc-options: -Wall -O2 -threaded
39+
if arch(javascript) || arch(wasm32)
40+
buildable: False

lib/snap-extras/obelisk-snap-extras.cabal

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ cabal-version: >=1.2
77

88
library
99
hs-source-dirs: src
10+
1011
build-depends:
1112
attoparsec
1213
, base
@@ -16,8 +17,11 @@ library
1617
, filepath
1718
, text
1819
, unordered-containers
20+
1921
exposed-modules:
2022
Obelisk.Snap.Extras
23+
2124
ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
22-
if arch(javascript)
25+
26+
if arch(javascript) || arch(wasm32)
2327
buildable: False

0 commit comments

Comments
 (0)