diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-16 15:28:26 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-16 16:08:38 +0100 |
| commit | cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5 (patch) | |
| tree | 30fb18578f1c5c81fef7ccc6ec5879a41fd4e5c0 /compiler/main/SysTools.lhs | |
| parent | 6759e5a482d927870c90efe97b820d492785a6fd (diff) | |
| download | haskell-cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5.tar.gz | |
Some alpha renaming
Mostly d -> g (matching DynFlag -> GeneralFlag).
Also renamed if* to when*, matching the Haskell if/when names
Diffstat (limited to 'compiler/main/SysTools.lhs')
| -rw-r--r-- | compiler/main/SysTools.lhs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index eeebe694ac..877bd6b4b4 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -375,7 +375,7 @@ runCpp :: DynFlags -> [Option] -> IO () runCpp dflags args = do let (p,args0) = pgm_P dflags args1 = args0 ++ args - args2 = if dopt Opt_WarnIsError dflags + args2 = if gopt Opt_WarnIsError dflags then Option "-Werror" : args1 else args1 mb_env <- getGccEnv args2 @@ -676,7 +676,7 @@ readElfSection _dflags section exe = do \begin{code} cleanTempDirs :: DynFlags -> IO () cleanTempDirs dflags - = unless (dopt Opt_KeepTmpFiles dflags) + = unless (gopt Opt_KeepTmpFiles dflags) $ do let ref = dirsToClean dflags ds <- readIORef ref removeTmpDirs dflags (Map.elems ds) @@ -684,7 +684,7 @@ cleanTempDirs dflags cleanTempFiles :: DynFlags -> IO () cleanTempFiles dflags - = unless (dopt Opt_KeepTmpFiles dflags) + = unless (gopt Opt_KeepTmpFiles dflags) $ do let ref = filesToClean dflags fs <- readIORef ref removeTmpFiles dflags fs @@ -692,7 +692,7 @@ cleanTempFiles dflags cleanTempFilesExcept :: DynFlags -> [FilePath] -> IO () cleanTempFilesExcept dflags dont_delete - = unless (dopt Opt_KeepTmpFiles dflags) + = unless (gopt Opt_KeepTmpFiles dflags) $ do let ref = filesToClean dflags files <- readIORef ref let (to_keep, to_delete) = partition (`elem` dont_delete) files @@ -1053,7 +1053,7 @@ linkDynLib dflags o_files dep_packages get_pkg_lib_path_opts l | osElfTarget (platformOS (targetPlatform dflags)) && dynLibLoader dflags == SystemDependent && - not (dopt Opt_Static dflags) + not (gopt Opt_Static dflags) = ["-L" ++ l, "-Wl,-rpath", "-Wl," ++ l] | otherwise = ["-L" ++ l] @@ -1097,7 +1097,7 @@ linkDynLib dflags o_files dep_packages , Option "-shared" ] ++ [ FileOption "-Wl,--out-implib=" (output_fn ++ ".a") - | dopt Opt_SharedImplib dflags + | gopt Opt_SharedImplib dflags ] ++ map (FileOption "") o_files ++ map Option ( |