summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Smeding <tom@tomsmeding.com>2022-10-16 16:34:05 +0200
committerTom Smeding <tom@tomsmeding.com>2022-10-16 16:34:05 +0200
commitd616a03191028113287a28c0b134071e8ba2cf1b (patch)
treefe91ba5b99c3df49525310d94a40549462d96727
parentb8fea3ab6654357340c3f6fcfdee27b9ee5519ce (diff)
No more vendor accelerate-llvm
-rw-r--r--.gitignore1
-rw-r--r--cabal.project23
2 files changed, 14 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 0b605e0..c89b5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
dist-newstyle/
-accelerate-llvm/
out.data
out.png
diff --git a/cabal.project b/cabal.project
index 247bfa3..25044a4 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,26 +1,31 @@
-packages:
- .
- accelerate-llvm/accelerate-llvm
- accelerate-llvm/accelerate-llvm-native
+packages: .
+-- So that we're able to use llvm-12
allow-newer:
accelerate-llvm:llvm-hs,
accelerate-llvm:llvm-hs-pure,
accelerate-llvm-native:llvm-hs,
accelerate-llvm-native:llvm-hs-pure
+-- There's a missing upper bound for libffi on accelerate-llvm-native, so we provide it here
+constraints:
+ libffi <= 0.1
+
+-- llvm12 support
source-repository-package
type: git
location: https://github.com/llvm-hs/llvm-hs
tag: llvm-12
subdir: llvm-hs llvm-hs-pure
--- source-repository-package
--- type: git
--- location: https://github.com/AccelerateHS/accelerate-llvm
--- tag: master
--- subdir: accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx
+-- llvm12 support
+source-repository-package
+ type: git
+ location: https://github.com/AccelerateHS/accelerate-llvm
+ tag: master
+ subdir: accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx
+-- llvm12 support
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate