Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cross-compilation (exclude TH) #2621

Merged
merged 2 commits into from
Dec 20, 2024
Merged

Fix cross-compilation (exclude TH) #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
700922a
Fix cross-compilation (exclude TH)
ysangkok Dec 16, 2024
96e41de
Merge branch 'main' into fix-cross
Gabriella439 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dhall/dhall.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ Common common
if flag(network-tests)
CPP-Options:
-DNETWORK_TESTS
if flag(cross)
CPP-Options: -DCROSS

GHC-Options: -Wall -Wcompat -Wincomplete-uni-patterns -optP-Wno-unicode-homoglyph

Expand Down Expand Up @@ -432,10 +434,12 @@ Test-Suite tasty
Dhall.Test.Schemas
Dhall.Test.SemanticHash
Dhall.Test.Substitution
Dhall.Test.TH
Dhall.Test.Tutorial
Dhall.Test.TypeInference
Dhall.Test.Util
if !flag(cross)
Other-Modules:
Dhall.Test.TH
Build-Depends:
dhall ,
foldl < 1.5 ,
Expand Down
5 changes: 5 additions & 0 deletions dhall/tests/Dhall/Test/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
module Main where

import System.FilePath ((</>))
Expand All @@ -17,7 +18,9 @@ import qualified Dhall.Test.QuickCheck
import qualified Dhall.Test.Regression
import qualified Dhall.Test.Schemas
import qualified Dhall.Test.SemanticHash
#ifndef CROSS
import qualified Dhall.Test.TH
#endif
import qualified Dhall.Test.Tags
import qualified Dhall.Test.Tutorial
import qualified Dhall.Test.TypeInference
Expand Down Expand Up @@ -69,7 +72,9 @@ getAllTests = do
, Dhall.Test.Tutorial.tests
, Dhall.Test.QuickCheck.tests
, Dhall.Test.Dhall.tests
#ifndef CROSS
, Dhall.Test.TH.tests
#endif
, Dhall.Test.Package.tests
]

Expand Down
Loading