diff options
| author | James Foster <ratherforky@gmail.com> | 2019-07-30 18:01:29 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-08-06 20:25:18 -0400 |
| commit | 0c1ccf3cad5da8ae974c2813767cfcc489391e21 (patch) | |
| tree | 4d7a06534123379a0d4d2903632bba30cb629c49 /hadrian/src/Rules/Compile.hs | |
| parent | ea16f6cb22148982f9a0956be82288d380c1d9d9 (diff) | |
| download | haskell-0c1ccf3cad5da8ae974c2813767cfcc489391e21.tar.gz | |
hadrian: Refactor file patterns for future Shake changes (fixes #17005)
Shake will be moving from its current implementation of ?== to one from
System.FilePattern. Support for `//` is being dropped, leaving only `*`
and `**` as special forms. This commit converts the existing file
patterns in Hadrian to the new format. It also removes all occurances
of <//> and changes the user-settings docs to remove references to //
and add **.
The conversion is as follows:
- //a ==> **/a
- a// ==> a/**
- a//b ==> a/**/b
Diffstat (limited to 'hadrian/src/Rules/Compile.hs')
| -rw-r--r-- | hadrian/src/Rules/Compile.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Rules/Compile.hs b/hadrian/src/Rules/Compile.hs index 2227bb01ca..92a94fe611 100644 --- a/hadrian/src/Rules/Compile.hs +++ b/hadrian/src/Rules/Compile.hs @@ -182,8 +182,8 @@ compileHsObjectAndHi rs objpath = do -- Allow such reads (see https://gitlab.haskell.org/ghc/ghc/wikis/Developing-Hadrian#haskell-object-files-and-hi-inputs) -- Note that this may allow too many *.hi and *.hi-boot files, but -- calculating the exact set of direct inputs is not feasible. - trackAllow [ "//*." ++ hisuf way - , "//*." ++ hibootsuf way + trackAllow [ "**/*." ++ hisuf way + , "**/*." ++ hibootsuf way ] buildWithResources rs $ target ctx (Ghc CompileHs stage) [src] [objpath] |