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/Rts.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/Rts.hs')
| -rw-r--r-- | hadrian/src/Rules/Rts.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/src/Rules/Rts.hs b/hadrian/src/Rules/Rts.hs index 64864eee82..a99d0f40a6 100644 --- a/hadrian/src/Rules/Rts.hs +++ b/hadrian/src/Rules/Rts.hs @@ -13,10 +13,10 @@ rtsRules = priority 3 $ do -- This is for backwards compatibility (the old make build system omitted the -- dummy version number). root <- buildRootRules - [ root -/- "//libHSrts_*-ghc*.so", - root -/- "//libHSrts_*-ghc*.dylib", - root -/- "//libHSrts-ghc*.so", - root -/- "//libHSrts-ghc*.dylib"] + [ root -/- "**/libHSrts_*-ghc*.so", + root -/- "**/libHSrts_*-ghc*.dylib", + root -/- "**/libHSrts-ghc*.so", + root -/- "**/libHSrts-ghc*.dylib"] |%> \ rtsLibFilePath' -> createFileLink (addRtsDummyVersion $ takeFileName rtsLibFilePath') rtsLibFilePath' |