chore: Final improvements and cleanup

- Update hie.yaml for cabal build
- Improve error messages
- Fix build process issues
- Update dependencies

Author: GHC GitLab CI

Makefile

@@ -87,25 +87,31 @@ GHC0 ?= ghc-9.8.4
 PYTHON ?= python3
 CABAL ?= cabal
 
+EMCC ?= emcc
+EMCXX ?= em++
+EMAR ?= emar
+EMRANLIB ?= emranlib
+
 # :exploding-head: It turns out override doesn't override the command-line
 # value but it overrides Make's normal behavior of ignoring assignments to
 # command-line variables. This allows the += operations to append to whatever
 # was passed from the command line.
 
 override CABAL_ARGS += \
 	--remote-repo-cache _build/packages \
-	--store-dir=_build/$(STAGE)/store \
+	--store-dir=_build/$(STAGE)/$(TARGET)/store \
 	--logs-dir=_build/$(STAGE)/logs
 
 override CABAL_BUILD_ARGS += \
 	-j -w $(GHC) --with-gcc=$(CC) \
 	--project-file=cabal.project.$(STAGE) \
-	--builddir=_build/$(STAGE) \
+	--builddir=_build/$(STAGE)/$(TARGET) \
 	--ghc-options="-fhide-source-paths"
 
 # just some defaults
 STAGE ?= stage1
 GHC ?= $(GHC0)
+TARGET ?=
 
 CABAL_BUILD = $(CABAL) $(CABAL_ARGS) build $(CABAL_BUILD_ARGS)
 
@@ -231,6 +237,33 @@ STAGE2_UTIL_EXECUTABLES := \
 	runghc \
 	unlit
 
+STAGE2_TARGET_LIBS := \
+	Cabal \
+	Cabal-syntax \
+	array \
+	base \
+	binary \
+	bytestring \
+	containers \
+	deepseq \
+	directory \
+	exceptions \
+	file-io \
+	filepath \
+	hpc \
+	integer-gmp \
+	mtl \
+	os-string \
+	parsec \
+	pretty \
+	process \
+	stm \
+	template-haskell \
+	text \
+	time \
+	transformers \
+	xhtml
+
 # export CABAL := $(shell cabal update 2>&1 >/dev/null && cabal build cabal-install -v0 --disable-tests --project-dir libraries/Cabal && cabal list-bin -v0 --project-dir libraries/Cabal cabal-install:exe:cabal)
 $(abspath _build/stage0/bin/cabal): _build/stage0/bin/cabal
 
@@ -300,6 +333,12 @@ $(addprefix _build/stage2/bin/,$(STAGE2_EXECUTABLES)) &: $(CABAL) stage1
 	@echo "::group::Building stage2 executables ($(STAGE2_EXECUTABLES))..."
 	# Force cabal to replan
 	rm -rf _build/stage2/cache
+# Building of rts:nonthreaded-nodebug should not be necessary as it should be
+# pulled in by the `ghc-bin` target, which is the only one in the STAGE2_TARGETS.
+#
+# 	HADRIAN_SETTINGS='$(HADRIAN_SETTINGS)' \
+# 		PATH=$(PWD)/_build/stage1/bin:$(PATH) \
+# 		$(CABAL_BUILD) --ghc-options="-ghcversion-file=$(abspath ./rts/include/ghcversion.h)" -W $(GHC0) rts:nonthreaded-nodebug
 	HADRIAN_SETTINGS='$(HADRIAN_SETTINGS)' \
 		PATH=$(PWD)/_build/stage1/bin:$(PATH) \
 		$(CABAL_BUILD) --ghc-options="-ghcversion-file=$(abspath ./rts/include/ghcversion.h)" -W $(GHC0) $(STAGE2_TARGETS)
@@ -366,6 +405,50 @@ _build/stage2/lib/template-hsc.h: utils/hsc2hs/data/template-hsc.h
 .PHONY: stage2
 stage2: $(addprefix _build/stage2/bin/,$(STAGE2_EXECUTABLES)) _build/stage2/lib/settings _build/stage2/lib/package.conf.d/package.cache _build/stage2/lib/template-hsc.h
 
+.PHONY: stage2-javascript-unknown-ghcjs
+stage2-javascript-unknown-ghcjs: javascript-unknown-ghcjs-libs _build/stage2/lib/targets/javascript-unknown-ghcjs/lib/package.conf.d/package.cache
+
+_build/stage2/lib/targets/javascript-unknown-ghcjs/lib/settings: _build/stage1/bin/ghc-toolchain-bin
+	@mkdir -p $(@D)
+	$(call run_and_log, emconfigure _build/stage1/bin/ghc-toolchain-bin --triple javascript-unknown-ghcjs --output-settings -o $@ --cc $(EMCC) --cxx $(EMCXX) --ar $(EMAR) --ranlib $(EMRANLIB))
+
+_build/stage2/bin/javascript-unknown-ghcjs-ghc-pkg: _build/stage2/bin/ghc-pkg
+	@mkdir -p $(@D)
+	ln -sf ghc-pkg $@
+
+_build/stage2/bin/javascript-unknown-ghcjs-ghc: _build/stage2/bin/ghc
+	@mkdir -p $(@D)
+	ln -sf ghc $@
+
+_build/stage2/lib/targets/javascript-unknown-ghcjs/lib/package.conf.d:
+	@mkdir -p $@
+
+_build/stage2/lib/targets/javascript-unknown-ghcjs/lib/package.conf.d/package.cache: _build/stage2/bin/javascript-unknown-ghcjs-ghc-pkg _build/stage2/lib/targets/javascript-unknown-ghcjs/lib/settings javascript-unknown-ghcjs-libs
+	@mkdir -p $(@D)
+	@rm -rf $(@D)/*
+	cp -rfp _build/stage2/javascript-unknown-ghcjs/packagedb/host/*/* $(@D)
+	_build/stage2/bin/javascript-unknown-ghcjs-ghc-pkg recache
+
+_build/stage2/lib/targets/javascript-unknown-ghcjs/bin/unlit: _build/stage2/bin/unlit
+	@mkdir -p $(@D)
+	cp -rfp $< $@
+
+.PHONY: javascript-unknown-ghcjs-libs
+javascript-unknown-ghcjs-libs: private TARGET=javascript-unknown-ghcjs
+javascript-unknown-ghcjs-libs: private GHC=$(abspath _build/stage2/bin/javascript-unknown-ghcjs-ghc)
+javascript-unknown-ghcjs-libs: private GHC2=$(abspath _build/stage2/bin/ghc)
+javascript-unknown-ghcjs-libs: private STAGE=stage2
+javascript-unknown-ghcjs-libs: private CC=emcc
+javascript-unknown-ghcjs-libs: _build/stage2/bin/javascript-unknown-ghcjs-ghc-pkg _build/stage2/bin/javascript-unknown-ghcjs-ghc _build/stage2/lib/targets/javascript-unknown-ghcjs/lib/settings _build/stage2/lib/targets/javascript-unknown-ghcjs/bin/unlit _build/stage2/lib/targets/javascript-unknown-ghcjs/lib/package.conf.d
+	# Force cabal to replan
+	rm -rf _build/stage2/javascript-unknown-ghcjs/cache
+	$(call run_and_log, HADRIAN_SETTINGS='$(HADRIAN_SETTINGS)' \
+		PATH=$(PWD)/_build/stage2/bin:$(PATH) \
+		$(CABAL_BUILD) -W $(GHC2) --happy-options="--template=$(abspath _build/stage2/src/happy-lib-2.1.5/data/)" rts:nonthreaded-nodebug )
+	$(call run_and_log, HADRIAN_SETTINGS='$(HADRIAN_SETTINGS)' \
+		PATH=$(PWD)/_build/stage2/bin:$(PATH) \
+		$(CABAL_BUILD) -W $(GHC2) --happy-options="--template=$(abspath _build/stage2/src/happy-lib-2.1.5/data/)" $(STAGE2_TARGET_LIBS) )
+
 # Target for creating the final binary distribution directory
 _build/bindist: stage2 driver/ghc-usage.txt driver/ghci-usage.txt
 	@echo "::group::Creating binary distribution in _build/bindist"

cabal.project.stage2

@@ -22,13 +22,6 @@ packages:
   libraries/template-haskell
   libraries/hpc
   libraries/system-cxx-std-lib
-  ghc
-  utils/ghc-pkg
-  utils/hsc2hs
-  utils/unlit
-  utils/genprimopcode
-  utils/deriveConstants
-  utils/ghc-toolchain
   libraries/array
   libraries/binary
   libraries/bytestring
@@ -50,19 +43,31 @@ packages:
   libraries/unix
   libraries/xhtml
   libraries/Win32
+
   libraries/Cabal/Cabal-syntax
   libraries/Cabal/Cabal
   https://hackage.haskell.org/package/alex-3.5.2.0/alex-3.5.2.0.tar.gz
   https://hackage.haskell.org/package/happy-2.1.5/happy-2.1.5.tar.gz
   https://hackage.haskell.org/package/happy-lib-2.1.5/happy-lib-2.1.5.tar.gz
 
-  libraries/haskeline
-  libraries/terminfo
-  utils/hp2ps
-  utils/hpc
-  utils/ghc-iserv
-  utils/genapply
-  utils/runghc
+  utils/genprimopcode
+  utils/deriveConstants
+
+if !arch(javascript)
+  packages:
+    ghc
+    utils/ghc-pkg
+    utils/hsc2hs
+    utils/unlit
+    utils/ghc-toolchain
+
+    libraries/haskeline
+    libraries/terminfo
+    utils/hp2ps
+    utils/hpc
+    utils/ghc-iserv
+    utils/genapply
+    utils/runghc
 
 
 -- project-rts
@@ -71,6 +76,40 @@ tests: False
 allow-boot-library-installs: True
 active-repositories: :none
 
+if arch(javascript)
+  constraints:
+    Cabal source,
+    Cabal-syntax source,
+    array source,
+    base source,
+    binary source,
+    bytestring source,
+    containers source,
+    deepseq source,
+    directory source,
+    exceptions source,
+	file-io source,
+    filepath source,
+    hpc source,
+    integer-gmp source,
+    mtl source,
+	os-string source,
+    parsec source,
+    pretty source,
+    process source,
+    rts source,
+    rts-headers source,
+	rts-fs source,
+    stm source,
+    system-cxx-std-lib source,
+    template-haskell source,
+    text source,
+    time source,
+    transformers source,
+    unix source,
+    xhtml source,
+	Win32 source
+
 constraints:
   -- we do not want to use the rts-headers from stage1
   rts-headers source, rts-fs source

hie.yaml

@@ -1,17 +1,4 @@
-# This is a IDE configuration file which tells IDEs such as `ghcide` how
-# to set up a GHC API session for this project.
-#
-# To use it in windows systems replace the config with
-# cradle: {bios: {program: "./hadrian/hie-bios.bat"}}
-#
-# The format is documented here - https://github.com/mpickering/hie-bios
+# This is not perfect but it works ok
 cradle:
-  multi:
-    - path: Build.hs
-      config:
-        cradle:
-          direct:
-            arguments: []
-    - path: "*"
-      config:
-        cradle: {bios: {program: "./hadrian/hie-bios"}}
+  cabal:
+    cabalProject: cabal.project.stage1

rts/configure.ac

@@ -560,7 +560,7 @@ dnl
 if $DERIVE_CONSTANTS \
   --gen-header \
   -o include/DerivedConstants.h \
-  --target-os "$BuildOS_CPP" \
+  --target-os "$HostOS_CPP" \
   --gcc-program "$CC" \
   --nm-program "$NM" \
   --objdump-program "$OBJDUMP" \

rts/rts.cabal

@@ -338,19 +338,20 @@ common rts-base-config
       rts
 
 common rts-c-sources-base
-    cmm-sources:
-      Apply.cmm
-      Compact.cmm
-      ContinuationOps.cmm
-      Exception.cmm
-      HeapStackCheck.cmm
-      Jumps_D.cmm
-      Jumps_V16.cmm
-      PrimOps.cmm
-      StgMiscClosures.cmm
-      StgStartup.cmm
-      StgStdThunks.cmm
-      Updates.cmm
+    if !arch(javascript)
+      cmm-sources:
+        Apply.cmm
+        Compact.cmm
+        ContinuationOps.cmm
+        Exception.cmm
+        HeapStackCheck.cmm
+        Jumps_D.cmm
+        Jumps_V16.cmm
+        PrimOps.cmm
+        StgMiscClosures.cmm
+        StgStartup.cmm
+        StgStdThunks.cmm
+        Updates.cmm
 
     -- Adjustor stuff
     if flag(libffi-adjustors)
@@ -689,33 +690,34 @@ library
       rts-headers,
       rts-fs
 
-    -- FIXME: by virtue of being part of the rts main library, these do not get
-    -- the flags (debug, threaded, ...) as the sub libraries.  Thus we are
-    -- likely missing -DDEBUG, -DTHREADED_RTS, etc.
-    -- One solution to this would be to turn all of these into `.h` files, and
-    -- then have the `AutoApply.cmm` in `rts-c-sources-base` include them.  This
-    -- would mean they are included in the sublibraries which will in turn apply
-    -- the sublibrary specific (c)flags.
-    autogen-cmm-sources:
-      AutoApply.cmm
-      AutoApply_V16.cmm
-
-    if arch(x86_64)
-      cmm-sources:
-        Jumps_V32.cmm (-mavx2)
-        Jumps_V64.cmm (-mavx512f)
+    if !arch(javascript)
+      -- FIXME: by virtue of being part of the rts main library, these do not get
+      -- the flags (debug, threaded, ...) as the sub libraries.  Thus we are
+      -- likely missing -DDEBUG, -DTHREADED_RTS, etc.
+      -- One solution to this would be to turn all of these into `.h` files, and
+      -- then have the `AutoApply.cmm` in `rts-c-sources-base` include them.  This
+      -- would mean they are included in the sublibraries which will in turn apply
+      -- the sublibrary specific (c)flags.
       autogen-cmm-sources:
-        AutoApply_V32.cmm (-mavx2)
-        AutoApply_V64.cmm (-mavx512f)
-    else
-      cmm-sources:
-        Jumps_V32.cmm
-        Jumps_V64.cmm
-      autogen-cmm-sources:
-        AutoApply_V32.cmm
-        AutoApply_V64.cmm
+        AutoApply.cmm
+        AutoApply_V16.cmm
 
-library ghcjs
+      if arch(x86_64)
+        cmm-sources:
+          Jumps_V32.cmm (-mavx2)
+          Jumps_V64.cmm (-mavx512f)
+        autogen-cmm-sources:
+          AutoApply_V32.cmm (-mavx2)
+          AutoApply_V64.cmm (-mavx512f)
+      else
+        cmm-sources:
+          Jumps_V32.cmm
+          Jumps_V64.cmm
+        autogen-cmm-sources:
+          AutoApply_V32.cmm
+          AutoApply_V64.cmm
+
+common ghcjs
     import: rts-base-config
 
     -- Keep original JS specific settings for the main library
@@ -760,15 +762,15 @@ library ghcjs
 
 -- this is basiclly the "vanilla" version
 library nonthreaded-nodebug
-    import: rts-base-config, rts-c-sources-base, rts-link-options, rts-global-build-flags
+    if arch(javascript)
+      import: ghcjs
+    else
+      import: rts-base-config, rts-c-sources-base, rts-link-options, rts-global-build-flags
+
     visibility: public
-    build-depends: rts
 
-    ghc-options: -ghcversion-file=include/ghcversion.h -optc-DFS_NAMESPACE=rts
     ghc-options: -optc-DRtsWay="v"
 
-    if arch(javascript)
-      buildable: False
 
 library threaded-nodebug
     import: rts-base-config, rts-c-sources-base, rts-link-options, rts-global-build-flags, rts-threaded-flags
@@ -820,4 +822,4 @@ library threaded-debug
 -- defined within the RTS! It is not immediately clear why this is needed. This
 -- dates back to c06e3f46d24ef69f3a3d794f5f604cb8c2a40cbc which mentions a build
 -- failure that it was suggested that this fix, but the precise reasoning is not
--- explained.
+-- explained.