X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4431dd8055cff911866049d1667ccf331db68e46;hb=94b1c019c4b397d8aad1e8cad8919a1208cceb0a;hp=6f255a4bccd298307558aff538998a9ba93cdaa6;hpb=f65bf7559b3e92607cfcf7a334e9994891dd9c32;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 6f255a4..4431dd8 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -153,7 +153,7 @@ GhcWithSMP=$(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised)), # 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))) +OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin))) ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc sparc64))) ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES" @@ -550,6 +550,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d)) # Mingwex Library # HaveLibMingwEx = @HaveLibMingwEx@ +DLLTOOL = @DlltoolCmd@ #----------------------------------------------------------------------------- # Flex (currently unused, could be moved to glafp-utils) @@ -618,10 +619,9 @@ LdIsGNULd = @LdIsGNULd@ # ar: Bad file number # see #3201. We need to specify a smaller max command-line size # to work around it. 32767 doesn't work; 30000 does. -ifeq "$(Windows)" "YES" -XARGS = xargs -s 30000 -else XARGS = xargs +ifeq "$(Windows)" "YES" +XARGS_OPTS = -s 30000 endif #