diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-11-16 17:24:12 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-12-01 03:12:21 -0500 |
| commit | 86c14db5fdd07fe94a7c9016368f0d7cc6a02be8 (patch) | |
| tree | 178492c14ea00a6ba37cf514628f54afefc9a5a6 | |
| parent | bffd407410e00935f0098dbfda3bc2b402a36e04 (diff) | |
| download | haskell-86c14db5fdd07fe94a7c9016368f0d7cc6a02be8.tar.gz | |
Switch RTS cabal file / package conf to use Rts.h not Stg.h
When we give cabal a configure script, it seems to begin checking
whether or not Stg.h is valid, and then gets tripped up on all the
register stuff which evidentally requires obscure command line flags to
go.
We can side-step this by making the test header Rts.h instead, which is
more normal.
I was a bit sketched out making this change, as I don't know why the
Cabal library would suddenly beging checking the header. But I did
confirm even without my RTS configure script the header doesn't compile
stand-alone, and also the Stg.h is a probably-arbitrary choice since it
dates all the way back to 2002 in
2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc.
| -rw-r--r-- | rts/package.conf.in | 2 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rts/package.conf.in b/rts/package.conf.in index 1d3611f930..cb5a436f5c 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -76,7 +76,7 @@ include-dirs: TOP"/rts/include" LIBDW_INCLUDE_DIR #endif -includes: Stg.h +includes: Rts.h cc-options: ld-options: diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index 11ee9229ae..419d4b15bd 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -152,7 +152,7 @@ library include-dirs: include @FFIIncludeDir@ @LibdwIncludeDir@ - includes: Stg.h + 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 -- ^ from include |