Skip to content
Snippets Groups Projects
Commit 0ccff013 authored by Ben Gamari's avatar Ben Gamari
Browse files

rts: Don't declare libCffi as bundled when using system libffi

Previously the rts's cabal file would claim that it bundled libffi, even
if we are using the system's libffi. Fixes #19869.
parent a6479c53
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,8 @@ flag libdl
default: @CabalHaveLibdl@
flag ffi
default: @CabalHaveLibffi@
flag use-system-libffi
default: @UseSystemLibFFI@
flag need-pthread
default: @CabalNeedLibpthread@
flag libbfd
......@@ -55,10 +57,14 @@ library
-- expects the unit-id to be
-- set without version
ghc-options: -this-unit-id rts
if os(windows)
extra-bundled-libraries: Cffi-6
else
extra-bundled-libraries: Cffi
-- If we are using an in-tree libffi then we must declare it as a bundled
-- library to ensure that Cabal installs it.
if !flag(use-system-libffi)
if os(windows)
extra-bundled-libraries: Cffi-6
else
extra-bundled-libraries: Cffi
-- The make build system does something special in config.mk.in
-- for generating profiled, debugged, etc builds of those
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment