File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change 163
163
WITH_TERMINFO=NO
164
164
''
165
165
# musl doesn't have a system-linker. Only on x86, and on x86 we need it, as
166
- # our elf linker for x86_64 is broken.
167
- + lib . optionalString ( targetPlatform . isAndroid || ( targetPlatform . isMusl && ! targetPlatform . isx86 ) ) ''
166
+ # our elf linker for x86_64 is broken. The i686 one seems also to not exist.
167
+ # So it's really _just_ x86_64.
168
+ + lib . optionalString ( targetPlatform . isAndroid || ( targetPlatform . isMusl && ! targetPlatform . isx86_64 ) ) ''
168
169
compiler_CONFIGURE_OPTS += --flags=-dynamic-system-linker
169
170
''
170
171
# While split sections are now enabled by default in ghc 8.8 for windows,
325
326
# The fact that we need to set this here is pretty idiotic. GHC should figure this out on it's own.
326
327
# Either have a runtime flag/setting to disable it or if dlopen fails, remember that it failed and
327
328
# fall back to non-dynamic. We only have x86_64 dynamic linker with musl.
328
- + lib . optionalString ( targetPlatform . isAndroid || ( targetPlatform . isMusl && ! targetPlatform . isx86 ) )
329
+ + lib . optionalString ( targetPlatform . isAndroid || ( targetPlatform . isMusl && ! targetPlatform . isx86_64 ) )
329
330
" '*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker'"
330
331
# The following is required if we build on aarch64-darwin for aarch64-iOS. Otherwise older
331
332
# iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH
You can’t perform that action at this time.
0 commit comments