diff --git a/.gitmodules b/.gitmodules index e67da68c..cbf4e6ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,3 @@ [submodule "deps/argo"] path = deps/argo url = https://github.com/galoisinc/argo -[submodule "deps/libffi"] - path = deps/libffi - url = https://github.com/RyanGlScott/libffi - branch = static-linking-alt diff --git a/cabal.project b/cabal.project index 76c67579..d8665fc9 100644 --- a/cabal.project +++ b/cabal.project @@ -3,4 +3,3 @@ packages: cryptol-remote-api tests deps/argo/argo - deps/libffi diff --git a/cryptol.cabal b/cryptol.cabal index 6b333ed1..c191941f 100644 --- a/cryptol.cabal +++ b/cryptol.cabal @@ -86,7 +86,7 @@ library build-depends: integer-gmp >= 1.0 && < 1.1 if flag(ffi) - build-depends: libffi, + build-depends: libffi >= 0.2, unix cpp-options: -DFFI_ENABLED diff --git a/deps/libffi b/deps/libffi deleted file mode 160000 index 3969b8e7..00000000 --- a/deps/libffi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3969b8e781f3d02289be89488b908815e99bf5aa