Fix new error while bootstrapping

stable-haskell · Jan 8, 2025 · 0cbfef4 · 0cbfef4
1 parent b6efa77
commit 0cbfef4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ HADRIAN_SETTINGS_STAGE0 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
 HADRIAN_SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
 SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs stage1)
 
-CABAL := /home/hsyl20/repo/cabal/dist-newstyle/build/x86_64-linux/ghc-9.8.2/cabal-install-3.15.0.0/x/cabal/build/cabal/cabal
+CABAL := /home/hsyl20/projects/cabal/dist-newstyle/build/x86_64-linux/ghc-9.10.1/cabal-install-3.15.0.0/x/cabal/build/cabal/cabal
 # CABAL := cabal
 
 all: _build/stage1/bin/ghc
@@ -14,6 +14,13 @@ _build/stage0/bin/ghc:
 	cp -rf ./compiler    _build/stage0/src/libraries/ghc
 	cp -rf ./ghc   	     _build/stage0/src/ghc-bin
 	cp -rf ./utils       _build/stage0/src/
+
+	cp -f rts/include/rts/Bytecodes.h            _build/stage0/src/libraries/ghc/
+	cp -f rts/include/rts/storage/ClosureTypes.h _build/stage0/src/libraries/ghc/
+	cp -f rts/include/rts/storage/FunTypes.h     _build/stage0/src/libraries/ghc/
+	cp -f rts/include/stg/MachRegs.h             _build/stage0/src/libraries/ghc/
+	mkdir -p _build/stage0/src/libraries/ghc/MachRegs
+	cp -f rts/include/stg/MachRegs/*.h           _build/stage0/src/libraries/ghc/MachRegs/
 
 	## Substituting variables
 	cp _build/stage0/src/ghc-bin/ghc-bin.cabal{.in,}
@@ -89,6 +96,13 @@ _build/stage1/bin/ghc: _build/stage0/bin/ghc
 	cp -rf ./ghc   	      _build/stage1/src/ghc-bin
 	cp -rf ./config.sub   _build/stage1/src/libraries/rts/
 	cp -rf ./config.guess _build/stage1/src/libraries/rts/
+
+	cp -f rts/include/rts/Bytecodes.h            _build/stage1/src/libraries/ghc/
+	cp -f rts/include/rts/storage/ClosureTypes.h _build/stage1/src/libraries/ghc/
+	cp -f rts/include/rts/storage/FunTypes.h     _build/stage1/src/libraries/ghc/
+	cp -f rts/include/stg/MachRegs.h             _build/stage1/src/libraries/ghc/
+	mkdir -p _build/stage1/src/libraries/ghc/MachRegs
+	cp -f rts/include/stg/MachRegs/*.h           _build/stage1/src/libraries/ghc/MachRegs/
 
 	python rts/gen_event_types.py --event-types-defines _build/stage1/src/libraries/rts/include/rts/EventLogConstants.h
 	python rts/gen_event_types.py --event-types-array   _build/stage1/src/libraries/rts/include/rts/EventTypes.h

diff --git a/cabal.project-stage0 b/cabal.project-stage0
@@ -22,6 +22,8 @@ packages:
   ./_build/stage0/src/utils/genapply/
   ./_build/stage0/src/utils/deriveConstants/
 
+with-compiler: ghc-9.8.4
+
 benchmarks: False
 tests: False
 allow-boot-library-installs: True
@@ -37,6 +39,10 @@ package *
   executable-static: False
   ghc-options: -fhide-source-paths -j
 
+constraints:
+  -- for some reason 2.23 doesn't build
+  template-haskell <= 2.22
+
 package ghc-boot-th
   flags: +bootstrap
 

diff --git a/compiler/GHC/Parser/Lexer.x b/compiler/GHC/Parser/Lexer.x
@@ -3470,7 +3470,6 @@ topNoLayoutContainsCommas (ALRNoLayout b _ : _) = b
 -- If the generated alexScan/alexScanUser functions are called multiple times
 -- in this file, alexScanUser gets broken out into a separate function and
 -- increases memory usage. Make sure GHC inlines this function and optimizes it.
-{-# INLINE alexScanUser #-}
 
 lexToken :: P (PsLocated Token)
 lexToken = do