Rename LocalBuildInfo extraArgs to extraConfigArgs to avoid name clashes

haskell · Oct 10, 2010 · 93386b4 · 93386b4
1 parent ba5f9bd
commit 93386b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Distribution/Simple.hs b/Distribution/Simple.hs
@@ -234,8 +234,12 @@ configureAction hooks flags args = do
 
                 localbuildinfo0 <- confHook hooks epkg_descr flags
 
-                -- remember the .cabal filename if we know it and all the extra command line args
-                let localbuildinfo = localbuildinfo0{ pkgDescrFile = mb_pd_file, extraArgs = args }
+                -- remember the .cabal filename if we know it
+                -- and all the extra command line args
+                let localbuildinfo = localbuildinfo0 {
+                                       pkgDescrFile = mb_pd_file,
+                                       extraConfigArgs = args
+                                     }
                 writePersistBuildConfig distPref localbuildinfo
 
                 let pkg_descr = localPkgDescr localbuildinfo
@@ -422,7 +426,7 @@ getBuildConfig hooks verbosity distPref = do
             -- Use the current, not saved verbosity level:
             configVerbosity = Flag verbosity
           }
-      configureAction hooks cFlags' (extraArgs lbi)
+      configureAction hooks cFlags' (extraConfigArgs lbi)
 
 
 -- --------------------------------------------------------------------------

diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
@@ -463,7 +463,9 @@ configure (pkg_descr0, pbi) cfg
 
         let lbi = LocalBuildInfo{
                     configFlags         = cfg,
-                    extraArgs           = [], -- Actual args would be put here in configureAction
+                    extraConfigArgs     = [],  -- Currently configure does not
+                                               -- take extra args, but if it
+                                               -- did they would go here.
                     installDirTemplates = installDirs,
                     compiler            = comp,
                     buildDir            = distPref </> "build",

diff --git a/Distribution/Simple/LocalBuildInfo.hs b/Distribution/Simple/LocalBuildInfo.hs
@@ -86,10 +86,10 @@ import Data.List (nub)
 -- 'Distribution.Setup.ConfigFlags'.
 data LocalBuildInfo = LocalBuildInfo {
         configFlags   :: ConfigFlags,
-        -- ^ Options passed to the configuration step. 
+        -- ^ Options passed to the configuration step.
         -- Needed to re-run configuration when .cabal is out of date
-        extraArgs          :: [String],
-        -- ^ Extra args on the command line for the configuration step. 
+        extraConfigArgs     :: [String],
+        -- ^ Extra args on the command line for the configuration step.
         -- Needed to re-run configuration when .cabal is out of date
         installDirTemplates :: InstallDirTemplates,
                 -- ^ The installation directories for the various differnt