diff options
Diffstat (limited to 'mk/config.mk.in')
| -rw-r--r-- | mk/config.mk.in | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 2b5bd46aba..81298e4a93 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -119,7 +119,7 @@ SharedLibsPlatformList = \ i386-unknown-freebsd x86_64-unknown-freebsd \ i386-unknown-openbsd x86_64-unknown-openbsd \ i386-unknown-netbsd x86_64-unknown-netbsd \ - i386-unknown-mingw32 \ + i386-unknown-mingw32 x86_64-unknown-mingw32 \ i386-apple-darwin x86_64-apple-darwin powerpc-apple-darwin ifeq "$(SOLARIS_BROKEN_SHLD)" "NO" @@ -172,7 +172,7 @@ GhcWithSMP=$(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised)), # has support for this OS/ARCH combination. OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu))) -ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc sparc sparc64))) +ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc sparc sparc64 arm))) ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES" GhcWithInterpreter=YES @@ -543,6 +543,8 @@ compiler/cmm/Bitmap_HC_OPTS += -ffull-laziness # for some unknown reason, so turn full-laziness back on for this module. endif +GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@ + #----------------------------------------------------------------------------- # C compiler # @@ -622,11 +624,21 @@ ifeq "$(CrossCompiling)" "YES" SRC_HSC2HS_OPTS += --cross-compile endif +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/windres +else ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/windres +endif + #----------------------------------------------------------------------------- # Mingwex Library # HaveLibMingwEx = @HaveLibMingwEx@ +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DLLTOOL = inplace/mingw/bin/dlltool.exe +else ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32" +DLLTOOL = inplace/mingw/bin/dlltool.exe +endif #----------------------------------------------------------------------------- # Flex (currently unused, could be moved to glafp-utils) @@ -702,6 +714,7 @@ DTRACE = @DtraceCmd@ LD = @LdCmd@ NM = @NmCmd@ +OBJDUMP = @ObjdumpCmd@ LLC = @LlcCmd@ OPT = @OptCmd@ @@ -758,7 +771,11 @@ endif # REAL_SHELL = $(SHELL) +ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32" +STRIP_CMD = $(TOP)/inplace/mingw/bin/strip.exe +else STRIP_CMD = strip +endif PATCH_CMD = @PatchCmd@ TAR_CMD = @TarCmd@ BZIP2_CMD = bzip2 |