From: simonmar <unknown>
Date: Thu, 2 Nov 2000 14:33:15 +0000 (+0000)
Subject: [project @ 2000-11-02 14:33:15 by simonmar]
X-Git-Tag: Approximately_9120_patches~3442
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=cd39a1cf9efb41555510773a787b2762279290a0;p=ghc-hetmet.git

[project @ 2000-11-02 14:33:15 by simonmar]
Found a better way to do the arch test for $(GhcWithInterpreter), used
it for $(GhcWithNativeCodeGen) too and removed one $(shell...).
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 24d43d9..b83135e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -169,26 +169,18 @@ GhcWithHscBuiltViaC=@BootingFromHc@
 #
 # 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
-ifeq "$(linux_TARGET_OS)" "1"
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
 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
-endif
-endif
-endif
 
 #
 # Building various ways?