Fix issues while building linux static binary

commercialhaskell · Mar 30, 2020 · 657d978 · 657d978
1 parent 4b0bb64
commit 657d978
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 .stack-root/
 /.cabal-sandbox/
 TAGS
-/Setup/
+/Setup
 cabal-dev/
 cabal.sandbox.config
 dist/

diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
@@ -242,7 +242,7 @@ rules global@Global{..} args = do
     unless gUploadOnly $ releaseDir </> binaryExeFileName %> \out -> do
         need [releaseBinDir </> binaryName </> stackExeFileName]
         (Stdout versionOut) <- cmd (releaseBinDir </> binaryName </> stackExeFileName) "--version"
-        () <- cmd "git diff"
+        -- () <- cmd "git diff"
         when (not gAllowDirty && "dirty" `isInfixOf` lower versionOut) $
             error ("Refusing continue because 'stack --version' reports dirty.  Use --" ++
                    allowDirtyOptName ++ " option to continue anyway.")