diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2013-08-30 12:54:22 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2013-08-30 12:54:22 -0400 |
| commit | 26bf3dd478dce53eb50c2ce13821d61e416e3fe7 (patch) | |
| tree | 7b025b1eca208e96cf5e1916dd12f0054fda79ea /compiler/main/GhcMake.hs | |
| parent | 6d755c08ca125d991a95fbdc3ae1dc0608b722f1 (diff) | |
| parent | 85c1715d086bf2d35bc05133398f462919f2aa7b (diff) | |
| download | haskell-26bf3dd478dce53eb50c2ce13821d61e416e3fe7.tar.gz | |
Merge branch 'master' into ghc-parmake-gsoc
Conflicts:
compiler/main/DynFlags.hs
compiler/utils/FastString.lhs
Diffstat (limited to 'compiler/main/GhcMake.hs')
| -rw-r--r-- | compiler/main/GhcMake.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index e925e0648d..5fc21f3084 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -310,7 +310,7 @@ load how_much = do let main_mod = mainModIs dflags a_root_is_Main = any ((==main_mod).ms_mod) mod_graph - do_linking = a_root_is_Main || no_hs_main || ghcLink dflags == LinkDynLib + do_linking = a_root_is_Main || no_hs_main || ghcLink dflags == LinkDynLib || ghcLink dflags == LinkStaticLib when (ghcLink dflags == LinkBinary && isJust ofile && not do_linking) $ |