Skip to content

Commit 420310e

Browse files
committed
Fix libffi linking
1 parent 43d7f9b commit 420310e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rts/rts.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,13 @@ library
613613
Jumps_V32.cmm
614614
Jumps_V64.cmm
615615

616+
-- we always link against libffi, even without libffi-adjustors
617+
extra-libraries: ffi
618+
extra-libraries-static: ffi
619+
616620
-- Adjustor stuff
617621
if flag(libffi-adjustors)
618622
c-sources: adjustor/LibffiAdjustor.c
619-
extra-libraries: ffi
620-
extra-libraries-static: ffi
621623
else
622624
-- Use GHC's native adjustors
623625
if arch(i386)
@@ -633,8 +635,6 @@ library
633635
-- fall back to the LibffiAdjustor if neither i386, or x86_64
634636
if !arch(x86_64) && !arch(i386)
635637
c-sources: adjustor/LibffiAdjustor.c
636-
extra-libraries: ffi
637-
extra-libraries-static: ffi
638638

639639
-- Use assembler STG entrypoint on architectures where it is used
640640
if arch(ppc) || arch(ppc64) || arch(s390x) || arch(riscv64) || arch(loongarch64)

0 commit comments

Comments
 (0)