diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-07-12 17:26:47 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-27 04:47:51 -0400 |
| commit | 2ce48fe9d1334dadf6fa1411238e52d65b66ba41 (patch) | |
| tree | 1f48a9e2e2ae3350c3802875bef128327afdf593 /mk | |
| parent | 246f08ac032392f808c7aa53dd78a96d9b43e63f (diff) | |
| download | haskell-2ce48fe9d1334dadf6fa1411238e52d65b66ba41.tar.gz | |
rts: Break up adjustor logic
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 086a9147f2..35f6e2d087 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -181,16 +181,6 @@ else GhcWithInterpreter=$(if $(findstring YES,$(DYNAMIC_GHC_PROGRAMS)),YES,NO) endif -# Whether to use libffi for adjustors (foreign import "wrapper") or -# not. If we have built-in support (rts/Adjustor.c) then we use that, -# otherwise we fall back on libffi, which is slightly slower. -ArchHasAdjustorSupport = $(if $(findstring $(TargetArch_CPP),i386 x86_64),YES,NO) -ifeq "$(ArchHasAdjustorSupport)" "YES" -UseLibFFIForAdjustors=NO -else -UseLibFFIForAdjustors=YES -endif - # On Windows we normally want to make a relocatable bindist, to we # ignore flags like libdir ifeq "$(Windows_Host)" "YES" @@ -333,6 +323,8 @@ UseSystemLibFFI=@UseSystemLibFFI@ FFILibDir=@FFILibDir@ FFIIncludeDir=@FFIIncludeDir@ +UseLibffiForAdjustors=@UseLibffiForAdjustors@ + UseLibdw=@UseLibdw@ LibdwLibDir=@LibdwLibDir@ LibdwIncludeDir=@LibdwIncludeDir@ |