diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-09-15 15:51:54 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-09-20 12:38:13 +0100 |
| commit | 8dcf331d5d6ddf1b6418546023d69385ec39e102 (patch) | |
| tree | df4c28ec9f2bf50aff11a70df82e56366ad0cecb /libraries/template-haskell | |
| parent | 59fe128c37b2befb1ece4bf3f8f5c9082bd213eb (diff) | |
| download | haskell-wip/bump-filepath-2.tar.gz | |
Update filepath to filepath-1.4.100.0wip/bump-filepath-2
Updates submodule
* Always rely on vendored filepath
* filepath must be built as stage0 dependency because it uses
template-haskell.
Towards #22098
Diffstat (limited to 'libraries/template-haskell')
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal.in | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index a3cfb6d765..ac7d3a95ef 100644 --- a/libraries/template-haskell/template-haskell.cabal.in +++ b/libraries/template-haskell/template-haskell.cabal.in @@ -27,14 +27,6 @@ source-repository head location: https://gitlab.haskell.org/ghc/ghc.git subdir: libraries/template-haskell - --- We give the option to vendor filepath to avoid making filepath non-reinstallable.. --- see #21738 for why we are doing this now and what the plan is for the future. -Flag vendor-filepath - Description: Vendor the dependency on filepath - Default: False - Manual: True - Library default-language: Haskell2010 other-extensions: @@ -68,25 +60,16 @@ Library ghc-prim, pretty == 1.1.* - if flag(vendor-filepath) - other-modules: - System.FilePath - System.FilePath.Posix - System.FilePath.Windows - hs-source-dirs: ./vendored-filepath . - default-extensions: - ImplicitPrelude - else - build-depends: filepath - hs-source-dirs: . + other-modules: + System.FilePath + System.FilePath.Posix + System.FilePath.Windows + hs-source-dirs: ./vendored-filepath . + default-extensions: + ImplicitPrelude ghc-options: -Wall -- We need to set the unit ID to template-haskell (without a -- version number) as it's magic. ghc-options: -this-unit-id template-haskell - - -- This should match the default-extensions used in 'ghc.cabal'. This way, - -- GHCi can be used to load it along with the compiler. - Default-Extensions: - NoImplicitPrelude |