diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 10:34:48 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 10:34:48 +0100 |
| commit | 99fd2469fba1a38b2a65b4694f337d92e559df01 (patch) | |
| tree | 20491590ccb07223afd9d1f6a6546213b0f43577 /mk/config.mk.in | |
| parent | d260d919eef22654b1af61334feed0545f64cea5 (diff) | |
| parent | 0d19922acd724991b7b97871b1404f3db5058b49 (diff) | |
| download | haskell-99fd2469fba1a38b2a65b4694f337d92e559df01.tar.gz | |
Merge remote-tracking branch 'origin/master' into newcg
* origin/master: (756 commits)
don't crash if argv[0] == NULL (#7037)
-package P was loading all versions of P in GHCi (#7030)
Add a Note, copying text from #2437
improve the --help docs a bit (#7008)
Copy Data.HashTable's hashString into our Util module
Build fix
Build fixes
Parse error: suggest brackets and indentation.
Don't build the ghc DLL on Windows; works around trac #5987
On Windows, detect if DLLs have too many symbols; trac #5987
Add some more Integer rules; fixes #6111
Fix PA dfun construction with silent superclass args
Add silent superclass parameters to the vectoriser
Add silent superclass parameters (again)
Mention Generic1 in the user's guide
Make the GHC API a little more powerful.
tweak llvm version warning message
New version of the patch for #5461.
Fix Word64ToInteger conversion rule.
Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)
...
Conflicts:
compiler/basicTypes/UniqSupply.lhs
compiler/cmm/CmmBuildInfoTables.hs
compiler/cmm/CmmLint.hs
compiler/cmm/CmmOpt.hs
compiler/cmm/CmmPipeline.hs
compiler/cmm/CmmStackLayout.hs
compiler/cmm/MkGraph.hs
compiler/cmm/OldPprCmm.hs
compiler/codeGen/CodeGen.lhs
compiler/codeGen/StgCmm.hs
compiler/codeGen/StgCmmBind.hs
compiler/codeGen/StgCmmLayout.hs
compiler/codeGen/StgCmmUtils.hs
compiler/main/CodeOutput.lhs
compiler/main/HscMain.hs
compiler/nativeGen/AsmCodeGen.lhs
compiler/simplStg/SimplStg.lhs
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 |