Skip to content
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

Don't pass --with-hpack to Setup.hs configure #3696 #3703

Merged
merged 1 commit into from
Dec 24, 2017
Merged

Don't pass --with-hpack to Setup.hs configure #3696 #3703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions src/Stack/Types/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,6 @@ configureOptsNoDir econfig bco deps isLocal package = concat
, map ("--extra-include-dirs=" ++) (Set.toList (configExtraIncludeDirs config))
, map ("--extra-lib-dirs=" ++) (Set.toList (configExtraLibDirs config))
, maybe [] (\customGcc -> ["--with-gcc=" ++ toFilePath customGcc]) (configOverrideGccPath config)
, hpackOptions (configOverrideHpack config)
, ["--ghcjs" | wc == Ghcjs]
, ["--exact-configuration" | useExactConf]
]
Expand All @@ -629,9 +628,6 @@ configureOptsNoDir econfig bco deps isLocal package = concat
where
toDepOption = if newerCabal then toDepOption1_22 else toDepOption1_18

hpackOptions HpackBundled = []
hpackOptions (HpackCommand cmd) = ["--with-hpack=" ++ cmd]

toDepOption1_22 ident gid = concat
[ "--dependency="
, packageNameString $ packageIdentifierName ident
Expand Down