diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-05-21 10:34:04 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-05-21 13:38:07 +0100 |
| commit | 1e2b3780ebc40d28cd0f029b90df102df09e6827 (patch) | |
| tree | 56aead4bd6d52ad3512fde51a3033dafe930d453 /compiler/ghci | |
| parent | 1d3fa868d139fb9a8a5e8b0e408c4c70389db8c3 (diff) | |
| download | haskell-1e2b3780ebc40d28cd0f029b90df102df09e6827.tar.gz | |
Handle -opt<blah> options more consistently (#7909)
Now these are always added by the run<blah> functions in SysTools, so
we never miss any out. Several cleanups resulted.
Diffstat (limited to 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/Linker.lhs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 2de130acd1..7bfee0f48b 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -291,15 +291,14 @@ reallyInitDynLinker dflags = ; pls <- linkPackages' dflags (preloadPackages (pkgState dflags)) pls0 -- (c) Link libraries from the command-line - ; let optl = getOpts dflags opt_l - ; let minus_ls = [ lib | '-':'l':lib <- optl ] + ; let cmdline_ld_inputs = ldInputs dflags + ; let minus_ls = [ lib | Option ('-':'l':lib) <- cmdline_ld_inputs ] ; let lib_paths = libraryPaths dflags ; libspecs <- mapM (locateLib dflags False lib_paths) minus_ls -- (d) Link .o files from the command-line - ; let cmdline_ld_inputs = ldInputs dflags - - ; classified_ld_inputs <- mapM (classifyLdInput dflags) cmdline_ld_inputs + ; classified_ld_inputs <- mapM (classifyLdInput dflags) + [ f | FileOption _ f <- cmdline_ld_inputs ] -- (e) Link any MacOS frameworks ; let platform = targetPlatform dflags |