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

4 files changed, 8 insertions, 30 deletions

diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index 4711421fc9..c6f23b55a7 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/hadrian/src/Settings/Default.hs
@@ -81,6 +81,7 @@ stage0Packages = do
              , directory
              , process
              , exceptions
+             , filepath
              , ghc
              , runGhc
              , ghcBoot
@@ -122,7 +123,6 @@ stage1Packages = do
         , containers
         , deepseq
         , exceptions
-        , filepath
         , ghc
         , ghcBignum
         , ghcCompact
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs
index 1cd72163aa..b6ba1e94ff 100644
--- a/hadrian/src/Settings/Packages.hs
+++ b/hadrian/src/Settings/Packages.hs
@@ -213,11 +213,6 @@ packageArgs = do
         , package hpcBin
           ? builder (Cabal Flags) ? arg "-build-tool-depends"
 
-        --------------------------------- template-haskell ----------------------------------
-
-        , package templateHaskell
-            ? mconcat [ builder (Cabal Flags) ? notStage0 ? arg "+vendor-filepath"
-                      , builder Ghc ? notStage0 ? arg ("-i" <> (root </> pkgPath filepath)) ]
         ]
 
 ghcBignumArgs :: Args
diff --git a/libraries/filepath b/libraries/filepath
-Subproject 4d7092ad3a8357b18a8fcbeb6fcf38045460eb9
+Subproject 872e19fce06ddd40bd0771dbd3cad2c3c6ed5e7
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