Skip to content

Fix for not working compiler override in stack.yaml #4608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snoyberg merged 2 commits into from
Mar 6, 2019
Merged

Fix for not working compiler override in stack.yaml #4608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59086c1
Integration test: compiler override does not work
snoyberg Mar 6, 2019
ba50a70
Enable back compiler override in stack.yaml
qrilka Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Stack/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,8 @@ loadBuildConfig mproject maresolver mcompiler = do
, "outside of a real project.\n" ]
return (p, dest)
let project = project'
{ projectResolver = fromMaybe (projectResolver project') mresolver
{ projectCompiler = mcompiler <|> projectCompiler project'
, projectResolver = fromMaybe (projectResolver project') mresolver
}

resolver <- completeSnapshotLocation $ projectResolver project
Expand Down Expand Up @@ -642,7 +643,7 @@ loadBuildConfig mproject maresolver mcompiler = do
throwM $ InvalidGhcOptionsSpecification (Map.keys unusedPkgGhcOptions)

let wanted = SMWanted
{ smwCompiler = fromMaybe (snapshotCompiler snapshot) mcompiler
{ smwCompiler = fromMaybe (snapshotCompiler snapshot) (projectCompiler project)
, smwProject = packages
, smwDeps = deps
, smwSnapshotLocation = projectResolver project
Expand Down
7 changes: 7 additions & 0 deletions test/integration/tests/override-compiler/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import StackTest
import Control.Monad (unless)

main :: IO ()
main = stackCheckStdout ["exec", "--", "ghc", "--numeric-version"] $ \ver ->
-- get rid of the newline character
unless (concat (lines ver) == "8.2.2") $ error $ "Invalid version: " ++ show ver
3 changes: 3 additions & 0 deletions test/integration/tests/override-compiler/files/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resolver: lts-13.10
compiler: ghc-8.2.2
packages: []