Skip to content
Snippets Groups Projects
Commit 1a5cf04f authored by Cheng Shao's avatar Cheng Shao :beach:
Browse files

hadrian: fix bindist makefile for wasm32-wasi target

This patch fixes one incoherent place between bindist makefile and
hadrian logic: I forgot to include wasi/wasm32 in
OsSupportsGHCi/ArchSupportsGHCi as well. And this results in incorrect
settings file generated after installing the bindist, and "Use
interpreter"/"Have interpreter" fields incorrectly have "NO" values
where they should be "YES" like --info output of in-tree version.

(cherry picked from commit 75a2eae4)
(cherry picked from commit 735f3f9a)
parent 3f3be277
No related branches found
No related tags found
No related merge requests found
...@@ -157,8 +157,8 @@ endif ...@@ -157,8 +157,8 @@ endif
# Whether to include GHCi in the compiler. Depends on whether the RTS linker # Whether to include GHCi in the compiler. Depends on whether the RTS linker
# has support for this OS/ARCH combination. # has support for this OS/ARCH combination.
OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu))) OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu wasi)))
ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc powerpc64 powerpc64le sparc sparc64 arm aarch64))) ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc powerpc64 powerpc64le sparc sparc64 arm aarch64 wasm32)))
ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES" ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
GhcWithInterpreter=YES GhcWithInterpreter=YES
......
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