@@ -48,7 +48,7 @@ import Data.Monoid.Map ( MonoidMap (..) )
48
48
import qualified Data.Text as T
49
49
import qualified Data.Yaml as Yaml
50
50
import Distribution.System
51
- ( Arch (OtherArch ), OS (.. ), Platform (.. ), buildPlatform )
51
+ ( Arch (.. ), OS (.. ), Platform (.. ), buildPlatform )
52
52
import qualified Distribution.Text ( simpleParse )
53
53
import Distribution.Version ( simplifyVersionRange )
54
54
import GHC.Conc ( getNumProcessors )
@@ -322,14 +322,6 @@ configFromConfigMonoid
322
322
configRequireStackVersion = simplifyVersionRange
323
323
(getIntersectingVersionRange configMonoidRequireStackVersion)
324
324
configCompilerCheck = fromFirst MatchMinor configMonoidCompilerCheck
325
- case arch of
326
- OtherArch " aarch64" -> pure ()
327
- OtherArch unk ->
328
- prettyWarnL
329
- [ flow " Unknown value for architecture setting:"
330
- , style Shell (fromString unk) <> " ."
331
- ]
332
- _ -> pure ()
333
325
configPlatformVariant <- liftIO $
334
326
maybe PlatformVariantNone PlatformVariant <$> lookupEnv platformVariantEnvVar
335
327
let configBuild = buildOptsFromMonoid configMonoidBuildOpts
@@ -427,6 +419,7 @@ configFromConfigMonoid
427
419
configNotifyIfNixOnPath = fromFirstTrue configMonoidNotifyIfNixOnPath
428
420
configNotifyIfGhcUntested = fromFirstTrue configMonoidNotifyIfGhcUntested
429
421
configNotifyIfCabalUntested = fromFirstTrue configMonoidNotifyIfCabalUntested
422
+ configNotifyIfArchUnknown = fromFirstTrue configMonoidNotifyIfArchUnknown
430
423
configNoRunCompile = fromFirstFalse configMonoidNoRunCompile
431
424
configAllowDifferentUser <-
432
425
case getFirst configMonoidAllowDifferentUser of
@@ -618,6 +611,18 @@ loadConfig inner = do
618
611
(mconcat $ configArgs : addConfigMonoid extraConfigs)
619
612
620
613
withConfig $ \ config -> do
614
+ let Platform arch _ = configPlatform config
615
+ case arch of
616
+ OtherArch unknownArch
617
+ | configNotifyIfArchUnknown config ->
618
+ prettyWarnL
619
+ [ flow " Unknown value for architecture setting:"
620
+ , style Shell (fromString unknownArch) <> " ."
621
+ , flow " To mute this message in future, set"
622
+ , style Shell (flow " notify-if-arch-unknown: false" )
623
+ , flow " in Stack's configuration."
624
+ ]
625
+ _ -> pure ()
621
626
unless (stackVersion `withinRange` configRequireStackVersion config)
622
627
(throwM (BadStackVersionException (configRequireStackVersion config)))
623
628
unless (configAllowDifferentUser config) $ do
0 commit comments