shake-ats 1.5.0.3 → 1.5.0.4

raw patch · 2 files changed

+6/−5 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• shake-ats.cabal +1/−1
• src/Development/Shake/ATS.hs +5/−4

@@ -1,5 +1,5 @@ name:                shake-ats-version:             1.5.0.3+version:             1.5.0.4 synopsis:            Utilities for building ATS projects with shake description:         Various helper functions for building [ATS](http://www.ats-lang.org/) with the [shake](http://shakebuild.com/) library homepage:            https://github.com/vmchale/shake-ats#readme

@@ -41,7 +41,7 @@ import           Data.Maybe                        (fromMaybe) import           Data.Semigroup                    (Semigroup (..)) import qualified Data.Text.Lazy                    as TL-import           Development.Shake                 hiding (doesFileExist)+import           Development.Shake                 hiding (doesFileExist, getEnv) import           Development.Shake.ATS.Environment import           Development.Shake.ATS.Rules import           Development.Shake.ATS.Type@@ -50,6 +50,7 @@ import           Development.Shake.Version import           Language.ATS import           System.Directory                  (copyFile, createDirectoryIfMissing, doesFileExist)+import           System.Environment                (getEnv) import           System.Exit                       (ExitCode (ExitSuccess))  -- | Whether generated libraries are to be considered compatible.@@ -64,9 +65,9 @@                           -> String -- ^ C code to be generated                           -> Action r atsCommand tc sourceFile out = do-    path <- fromMaybe "" <$> getEnv "PATH"+    path <- liftIO $ getEnv "PATH"     home' <- home tc-    h <- fromMaybe "" <$> getEnv "HOME"+    h <- liftIO $ getEnv "HOME"     let env = patsEnv h home' path     patsc <- patsopt tc     command env patsc ["--output", out, "-dd", sourceFile, "-cc"]@@ -128,7 +129,7 @@     h' <- pkgHome cc'     home' <- home tc     let libs' = ("atslib" :) $ bool libs ("gc" : libs) gc-    pure $ CConfig [h ++ "ccomp/runtime/", h, h' ++ "include"] libs' [h' ++ "lib", home' ++ "/ccomp/atslib/lib"] extras+    pure $ CConfig [h ++ "ccomp/runtime/", h, h' ++ "include", ".atspkg/contrib"] libs' [h' ++ "lib", home' ++ "/ccomp/atslib/lib"] extras  home :: MonadIO m => ATSToolConfig -> m String home tc = do