Found a better way to do the arch test for $(GhcWithInterpreter), used
it for $(GhcWithNativeCodeGen) too and removed one $(shell...).
#
# Target platforms supported:
# i386, alpha & sparc
#
# Target platforms supported:
# i386, alpha & sparc
-GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
+ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" ""
+GhcWithNativeCodeGen=YES
+else
+GhcWithNativeCodeGen=NO
+endif
# Include GHCi in the compiler
# Include GHCi in the compiler
-ifeq "$(linux_TARGET_OS)" "1"
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
GhcWithInterpreter=YES
else
GhcWithInterpreter=YES
else
-ifeq "$(solaris_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
-ifeq "$(freebsd_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
-ifeq "$(netbsd_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
GhcWithInterpreter=NO
endif
GhcWithInterpreter=NO
endif
#
# Building various ways?
#
# Building various ways?