diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 15:57:13 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:28:42 -0700 |
| commit | 89a8d817f0c2951ec305c286a526205d06bf9221 (patch) | |
| tree | 5295cab951600148bd83f1cae0ae5250816dc257 /compiler/main/DriverPipeline.hs | |
| parent | 0202b7cefbaf76dc53d43562dbc84a52debe2eb2 (diff) | |
| download | haskell-89a8d817f0c2951ec305c286a526205d06bf9221.tar.gz | |
Revert "Rename _closure to _static_closure, apply naming consistently."
This reverts commit 35672072b4091d6f0031417bc160c568f22d0469.
Conflicts:
compiler/main/DriverPipeline.hs
Diffstat (limited to 'compiler/main/DriverPipeline.hs')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 1977f0edcf..43f31e6f2c 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1600,7 +1600,7 @@ mkExtraObjToLinkIntoBinary dflags = do | gopt Opt_NoHsMain dflags = Outputable.empty | otherwise = vcat [ text "#include \"Rts.h\"", - text "extern StgClosure ZCMain_main_static_closure;", + text "extern StgClosure ZCMain_main_closure;", text "int main(int argc, char *argv[])", char '{', text " RtsConfig __conf = defaultRtsConfig;", @@ -1611,7 +1611,7 @@ mkExtraObjToLinkIntoBinary dflags = do Just opts -> ptext (sLit " __conf.rts_opts= ") <> text (show opts) <> semi, text " __conf.rts_hs_main = rtsTrue;", - text " return hs_main(argc,argv,&ZCMain_main_static_closure,__conf);", + text " return hs_main(argc,argv,&ZCMain_main_closure,__conf);", char '}', char '\n' -- final newline, to keep gcc happy ] |