ats-pkg 3.3.0.5 → 3.3.0.6

raw patch · 3 files changed

+14/−4 lines, 3 files

Files

CHANGELOG.md +5/−0
ats-pkg.cabal +1/−1
src/Language/ATS/Package/Compiler.hs +8/−3

CHANGELOG.md view

@@ -1,5 +1,10 @@ # ats-pkg +## 3.3.0.6++  * Only run `./autogen.sh` when installing the compiler if+    `automake`/`autoconf` exist+ ## 3.3.0.5    * Only run `cmake` when it exists

ats-pkg.cabal view

@@ -1,6 +1,6 @@ cabal-version:      2.0 name:               ats-pkg-version:            3.3.0.5+version:            3.3.0.6 license:            BSD3 license-file:       LICENSE copyright:          Copyright: (c) 2018-2019 Vanessa McHale

src/Language/ATS/Package/Compiler.hs view

@@ -12,8 +12,8 @@     , SetupScript     ) where +import qualified Development.Shake.Check as Check import           System.FilePath.Find    (find)--- import qualified Codec.Archive           as Archive import qualified Codec.Archive.Tar       as Tar import           Codec.Compression.GZip  (compress, decompress) import           Control.Monad@@ -103,9 +103,14 @@     withCompiler "Configuring" v      makeExecutable configurePath-    makeExecutable (cd </> "autogen.sh") -    silentCreateProcess v' ((proc (cd </> "autogen.sh") []) { cwd = Just cd })+    autoconf <- Check.autoconf+    print autoconf+    automake <- Check.automake++    when (autoconf && automake) $+        makeExecutable (cd </> "autogen.sh") *>+        silentCreateProcess v' ((proc (cd </> "autogen.sh") []) { cwd = Just cd })      silentCreateProcess v' ((proc configurePath ["--prefix", cd]) { cwd = Just cd })