[commit: ghc] wip/nfs-locking: Don't build system.config by default. (8ef67ed)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:24:27 UTC 2017


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

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

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

commit 8ef67edb699b18ca41ed535069f7183a15a98cf3
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Dec 16 23:07:44 2015 +0000

    Don't build system.config by default.


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

8ef67edb699b18ca41ed535069f7183a15a98cf3
 src/Rules/Config.hs  | 3 ++-
 src/Settings/User.hs | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Config.hs b/src/Rules/Config.hs
index bb4866d..50471d5 100644
--- a/src/Rules/Config.hs
+++ b/src/Rules/Config.hs
@@ -1,9 +1,10 @@
 module Rules.Config (configRules) where
 
 import Base
+import Settings.User
 
 configRules :: Rules ()
-configRules = do
+configRules = when buildSystemConfigFile $ do
     configPath -/- "system.config" %> \_ -> do
         need [configPath -/- "system.config.in", "configure"]
         putBuild "Running configure..."
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index d841028..5159bce 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -2,7 +2,7 @@ module Settings.User (
     userArgs, userPackages, userLibWays, userRtsWays, userTargetDirectory,
     userProgramPath, userKnownPackages, integerLibrary,
     trackBuildSystem, buildHaddock, validating, ghciWithDebugger, ghcProfiled,
-    ghcDebugged, dynamicGhcPrograms, laxDependencies
+    ghcDebugged, dynamicGhcPrograms, laxDependencies, buildSystemConfigFile
     ) where
 
 import Expression
@@ -77,3 +77,6 @@ laxDependencies = False
 
 buildHaddock :: Predicate
 buildHaddock = return True
+
+buildSystemConfigFile :: Bool
+buildSystemConfigFile = False



More information about the ghc-commits mailing list