summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-12-15 17:41:42 -0500
committerBen Gamari <ben@smart-cactus.org>2022-12-15 17:41:42 -0500
commit14b3bd80c0c57d66f75f44523fd28512d92933e2 (patch)
treeb9cdcc39af7b000e4e0264bce0f4472b8f964277
parent03ed0b95147ef6da99ac60302fea282d4df5f072 (diff)
downloadhaskell-wip/T22595.tar.gz
rts: Drop paths from configure from cabal filewip/T22595
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.in4
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