[commit: ghc] wip/nfs-locking: Rename appendCcArgs to ccArgs. (56cf235)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:29:06 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/56cf235d4dd89316597abb5024af57756b1fc47e/ghc

>---------------------------------------------------------------

commit 56cf235d4dd89316597abb5024af57756b1fc47e
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jun 16 07:52:33 2015 +0100

    Rename appendCcArgs to ccArgs.


>---------------------------------------------------------------

56cf235d4dd89316597abb5024af57756b1fc47e
 src/Settings/Util.hs | 6 +++---
 src/Targets.hs       | 2 +-
 src/UserSettings.hs  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Settings/Util.hs b/src/Settings/Util.hs
index 74190ec..e9433a2 100644
--- a/src/Settings/Util.hs
+++ b/src/Settings/Util.hs
@@ -4,7 +4,7 @@ module Settings.Util (
     -- Primitive settings elements
     arg, argM, args,
     argConfig, argStagedConfig, argConfigList, argStagedConfigList,
-    appendCcArgs,
+    ccArgs,
     -- argBuilderPath, argStagedBuilderPath,
     -- argPackageKey, argPackageDeps, argPackageDepKeys, argSrcDirs,
     -- argIncludeDirs, argDepIncludeDirs,
@@ -48,8 +48,8 @@ argStagedConfigList key = do
     argConfigList (stagedKey stage key)
 
 -- Pass arguments to Gcc and corresponding lists of sub-arguments of GhcCabal
-appendCcArgs :: [String] -> Settings
-appendCcArgs args = do
+ccArgs :: [String] -> Settings
+ccArgs args = do
     stage <- asks getStage
     mconcat [ builder (Gcc stage) ? append args
             , builder GhcCabal    ? appendSub "--configure-option=CFLAGS" args
diff --git a/src/Targets.hs b/src/Targets.hs
index 4bbb963..068e767 100644
--- a/src/Targets.hs
+++ b/src/Targets.hs
@@ -88,7 +88,7 @@ customPackageSettings = mconcat
     [ package integerLibrary ?
       mconcat [ windowsHost ? builder GhcCabal ?
                 arg "--configure-option=--with-intree-gmp"
-              , appendCcArgs ["-Ilibraries/integer-gmp2/gmp"] ]
+              , ccArgs ["-Ilibraries/integer-gmp2/gmp"] ]
 
     , package base ?
       builder GhcCabal ? arg ("--flags=" ++ integerLibraryName)
diff --git a/src/UserSettings.hs b/src/UserSettings.hs
index 3cbf136..52d9678 100644
--- a/src/UserSettings.hs
+++ b/src/UserSettings.hs
@@ -38,7 +38,7 @@ userSettings' = mconcat
     [ package base           ?
       builder GhcCabal       ? arg ("--flags=" ++ integerLibraryName)
 
-    , package integerLibrary ? appendCcArgs ["-Ilibraries/integer-gmp2/gmp"]
+    , package integerLibrary ? ccArgs ["-Ilibraries/integer-gmp2/gmp"]
 
     , windowsHost            ?
       package integerLibrary ?



More information about the ghc-commits mailing list