diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-12-15 17:41:42 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-12-22 23:37:23 -0500 |
| commit | b3ddf803061f92646615b435f71b1401fb4f9484 (patch) | |
| tree | fbbfdc1b7b7bf73d5b5fceac67fb73384a0f3356 | |
| parent | 32b32d7fbc5544ad6c435a1ea26e6353ec567a9b (diff) | |
| download | haskell-b3ddf803061f92646615b435f71b1401fb4f9484.tar.gz | |
rts: Drop paths from configure from cabal file
A long time ago we would rely on substitutions from the configure script
to inject paths of the include and library directories of libffi and
libdw. However, now these are instead handled inside Hadrian when
calling Cabal's `configure` (see the uses of `cabalExtraDirs` in
Hadrian's `Settings.Packages.packageArgs`).
While the occurrences in the cabal file were redundant, they did no
harm. However, since b5c714545abc5f75a1ffdcc39b4bfdc7cd5e64b4 they have
no longer been interpolated. @mpickering noticed the suspicious
uninterpolated occurrence of `@FFIIncludeDir@` in #22595,
prompting this commit to finally remove them.
| -rw-r--r-- | rts/rts.cabal.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index d10ee390e4..0b76f9b218 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -205,10 +205,6 @@ library cpp-options: -DNOSMP include-dirs: include - @FFIIncludeDir@ - @LibdwIncludeDir@ - - includes: Rts.h install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h |