From 6d015ec9d9bd48285eee36039a9bf3ceb42c7f06 Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 8 Jan 2004 10:34:02 +0000 Subject: [PATCH] [project @ 2004-01-08 10:34:02 by simonmar] If a -main-is flag was given, with a module name, use *that* module name rather than Main when deciding whether to link in batch mode or not. MERGE TO STABLE --- ghc/compiler/compMan/CompManager.lhs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc/compiler/compMan/CompManager.lhs b/ghc/compiler/compMan/CompManager.lhs index 2917879..cfea2b8 100644 --- a/ghc/compiler/compMan/CompManager.lhs +++ b/ghc/compiler/compMan/CompManager.lhs @@ -56,7 +56,7 @@ where import DriverPipeline ( CompResult(..), preprocess, compile, link ) import HscMain ( newHscEnv ) -import DriverState ( v_Output_file, v_NoHsMain ) +import DriverState ( v_Output_file, v_NoHsMain, v_MainModIs ) import DriverPhases import Finder import HscTypes @@ -443,8 +443,11 @@ cmLoadModules cmstate1 mg2unsorted let verb = verbosity dflags -- Find out if we have a Main module - let a_root_is_Main - = any ((=="Main").moduleNameUserString.modSummaryName) + mb_main_mod <- readIORef v_MainModIs + let + main_mod = mb_main_mod `orElse` "Main" + a_root_is_Main + = any ((==main_mod).moduleNameUserString.modSummaryName) mg2unsorted let mg2unsorted_names = map modSummaryName mg2unsorted -- 1.7.10.4