[Git][haskell-team/DHG_packages][experimental] ghc: Do not error out when cross building

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
a863a209 by Ilias Tsitsimpis at 2024-01-14T17:10:54+02:00
ghc: Do not error out when cross building

See also the discussion at Bug#910664.

- - - - -


2 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -3,6 +3,7 @@ ghc (9.6.4-1~exp1) experimental; urgency=medium
   * New upstream release
   * Build unregisterised on loong64 since llvm-15 is not available
   * Build unregisterised on powerpc (Closes: #1060196)
+  * Do not error out when cross building, let it fail instead
 
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Sat, 13 Jan 2024 16:22:36 +0200
 


=====================================
p/ghc/debian/rules
=====================================
@@ -165,13 +165,14 @@ override_dh_auto_build-arch: hadrian/hadrian
 ifeq (YES,$(BUILD_CROSS))
 	# See https://gitlab.haskell.org/ghc/ghc/-/issues/23975
 	# and https://gitlab.haskell.org/ghc/ghc/-/issues/22006
-	$(error cross-compilation is not supported)
+	$(warning cross-compilation is not supported)
 endif
 	hadrian/hadrian \
 		-V -j$(NUMJOBS) \
 		--docs=no-haddocks --docs=no-sphinx-html --docs=no-sphinx-pdfs \
 		binary-dist-dir \
 		$(EXTRA_HADRIAN_FLAGS)
+ifeq (NO,$(BUILD_CROSS))
 	# I have noticed that on some rare cases the package cache
 	# generated for stage2 is stale. This is probably an upstream bug,
 	# and it wouldn't affect us (the package cache for binary-dist-dir is
@@ -179,6 +180,7 @@ endif
 	# Maybe we should consider using ghc-pkg from binary-dist-dir instead.
 	# As a work-around for now, regenerate the stage2 package cache.
 	_build/stage1/bin/ghc-pkg recache
+endif
 
 # This rule is a superset of 'override_dh_auto_build-arch'. It builds everything
 # that the '-arch' rule builds, and then docs on top.



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/a863a209420d36167b6fc14c8f03b53b5cd9ccef

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/a863a209420d36167b6fc14c8f03b53b5cd9ccef
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20240114/83c34854/attachment-0001.htm>