Fix Setup.exe name for --upgrade-cabal on Windows #1002

commercialhaskell · Sep 17, 2015 · f24a247 · f24a247
1 parent c5772d0
commit f24a247
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -23,6 +23,7 @@ Bug fixes:
 * copyFile can't handle directories [#942](https://github.com/commercialhaskell/stack/pull/942)
 * Support for spaces in Haddock interface files [fpco/minghc#85](https://github.com/fpco/minghc/issues/85)
 * Temporarily building against a "shadowing" local package? [#992](https://github.com/commercialhaskell/stack/issues/992)
+* Fix Setup.exe name for --upgrade-cabal on Windows [#1002](https://github.com/commercialhaskell/stack/issues/1002)
 
 ## 0.1.4.1
 

diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -433,7 +433,11 @@ upgradeCabal menv wc = do
                     Just dir -> return dir
 
             runIn dir (compilerExeName wc) menv ["Setup.hs"] Nothing
-            let setupExe = toFilePath $ dir </> $(mkRelFile "Setup")
+            platform <- asks getPlatform
+            let setupExe = toFilePath $ dir </>
+                  (case platform of
+                     Platform _ os | isWindows os -> $(mkRelFile "Setup.exe")
+                     _ -> $(mkRelFile "Setup"))
                 dirArgument name' = concat
                     [ "--"
                     , name'