[project @ 2005-10-21 14:38:18 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6287525..1a0076b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -265,14 +265,12 @@ endif
 GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
-HaveRtldNext = @HaveRtldNext@
-HaveRtldLocal = @HaveRtldLocal@
 
 # Whether to include GHCi in the compiler.  Depends on whether the RTS linker
 # has support for this OS/ARCH combination.
 
 OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd darwin)))
-ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 powerpc powerpc64 sparc sparc64)))
+ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc powerpc64 sparc sparc64)))
 
 ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
 GhcWithInterpreter=YES
@@ -348,7 +346,7 @@ StripLibraries=NO
 #      Don't use -split-objs in in GhcLibHcOpts, because the build
 #              system needs to do other special magic if you are
 #              doing object-file splitting
-ifneq "$(findstring $(HostArch_CPP), i386 powerpc sparc)" ""
+ifneq "$(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc)" ""
 SplitObjs=YES
 else
 SplitObjs=NO