--ghc-variant implies --no-system-ghc (#530)

commercialhaskell · Aug 22, 2015 · 29d91f3 · 29d91f3
1 parent df58766
commit 29d91f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -126,7 +126,9 @@ configFromConfigMonoid configStackRoot mproject configMonoid@ConfigMonoid{..} =
                 }]
             configMonoidPackageIndices
 
-         configSystemGHC = fromMaybe True configMonoidSystemGHC
+         configGHCVariant0 = fmap parseGHCVariant configMonoidGHCVariant
+
+         configSystemGHC = fromMaybe (isNothing configGHCVariant0) configMonoidSystemGHC
          configInstallGHC = fromMaybe False configMonoidInstallGHC
          configSkipGHCCheck = fromMaybe False configMonoidSkipGHCCheck
          configSkipMsys = fromMaybe False configMonoidSkipMsys
@@ -143,8 +145,6 @@ configFromConfigMonoid configStackRoot mproject configMonoid@ConfigMonoid{..} =
             $ configMonoidOS >>= Distribution.Text.simpleParse
          configPlatform = Platform arch os
 
-         configGHCVariant0 = fmap parseGHCVariant configMonoidGHCVariant
-
          configRequireStackVersion = simplifyVersionRange configMonoidRequireStackVersion
 
          configConfigMonoid = configMonoid

diff --git a/src/Stack/Options.hs b/src/Stack/Options.hs
@@ -243,7 +243,7 @@ configOptsParser docker =
     <*> optional (strOption
             ( long "ghc-variant"
            <> metavar "VARIANT"
-           <> help "Specialized GHC variant, e.g. integersimple"
+           <> help "Specialized GHC variant, e.g. integersimple (implies --no-system-ghc)"
             ))
     <*> optional (option auto
             ( long "jobs"