Merge pull request #6344 from cabalism/add/build-ghc-x.y.z-6342

Build _ with ghc-x.y.z
commercialhaskell · Nov 25, 2023 · 3d0a483 · 3d0a483
2 parents 0c11fba + e180ed0
commit 3d0a483
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.stan.toml b/.stan.toml
@@ -63,7 +63,7 @@
 
 # Anti-pattern: Data.ByteString.Char8.pack
 [[ignore]]
-  id = "OBS-STAN-0203-fki0nd-2666:3"
+  id = "OBS-STAN-0203-fki0nd-2668:3"
 # ✦ Description:   Usage of 'pack' function that doesn't handle Unicode characters
 # ✦ Category:      #AntiPattern
 # ✦ File:          src\Stack\Build\Execute.hs

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -46,6 +46,8 @@ Other enhancements:
   found. In YAML configuration files, the `notify-if-ghc-untested` and
   `notify-if-cabal-untested` keys are introduced, to allow the notification to
   be muted if unwanted.
+* The compiler version is included in Stack's build message (e.g.
+  `stack> build (lib + exe + test) with ghc-9.4.7`).
 
 Bug fixes:
 * Fix the `Curator` instance of `ToJSON`, as regards `expect-haddock-failure`.

diff --git a/doc/GUIDE.md b/doc/GUIDE.md
@@ -981,7 +981,7 @@ stack build :helloworld-test
 Building all executables for `helloworld' once. After a successful build of all of them, only specified executables will be rebuilt.
 helloworld> configure (lib + exe + test)
 Configuring helloworld-0.1.0.0...
-helloworld> build (lib + exe + test)
+helloworld> build (lib + exe + test) with ghc-x.y.z
 Preprocessing library for helloworld-0.1.0.0..
 Building library for helloworld-0.1.0.0..
 [1 of 2] Compiling Lib
@@ -1024,7 +1024,7 @@ and command again:
 ~~~text
 stack build :helloworld-test
 helloworld-0.1.0.0: unregistering (local file changes: test\Spec.hs)
-helloworld> build (lib + test)
+helloworld> build (lib + test) with ghc-x.y.z
 Preprocessing library for helloworld-0.1.0.0..
 Building library for helloworld-0.1.0.0..
 Preprocessing test suite 'helloworld-test' for helloworld-0.1.0.0..

diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -1985,9 +1985,12 @@ singleBuild
                       \undefined reference errors from the linker, along with \
                       \other problems."
 
+    actualCompiler <- view actualCompilerVersionL
     () <- announce
       (  "build"
       <> display (annSuffix executableBuildStatuses)
+      <> " with "
+      <> display actualCompiler
       )
     config <- view configL
     extraOpts <- extraBuildOptions wc eeBuildOpts
@@ -2017,7 +2020,6 @@ singleBuild
         else "haddock"
 
       -- For GHC 8.4 and later, provide the --quickjump option.
-      actualCompiler <- view actualCompilerVersionL
       let quickjump =
             case actualCompiler of
               ACGhc ghcVer