summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-06-25 09:42:49 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-06-28 15:20:45 -0400
commit03cc5d0258294fc83f65479e78dbe937622cfc88 (patch)
treea961f95ea5894d45322e257a74fae09cfd0cd3dd
parent16b9100c9ef6b34b88a52b3b9e663dd40abd028f (diff)
downloadhaskell-03cc5d0258294fc83f65479e78dbe937622cfc88.tar.gz
ghc.mk: fix 'make install' (`mk/system-cxx-std-lib-1.0.conf.install` does not exist)
before the change `make install` was failing as: ``` "mv" "/<<NIX>>/ghc-9.3.20220406/lib/ghc-9.5.20220625/bin/ghc-stage2" "/<<NIX>>/ghc-9.3.20220406/lib/ghc-9.5.20220625/bin/ghc" make[1]: *** No rule to make target 'mk/system-cxx-std-lib-1.0.conf.install', needed by 'install_packages'. Stop. ``` I think it's a recent regression caused by 0ef249aa where `system-cxx-std-lib-1.0.conf` is created (somewhat manually), but not the .install varianlt of it. The fix is to consistently use `mk/system-cxx-std-lib-1.0.conf` everywhere. Closes: https://gitlab.haskell.org/ghc/ghc/-/issues/21784
-rw-r--r--ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index d1ca1bf3e7..7d780525d4 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1003,7 +1003,7 @@ INSTALL_DISTDIR_compiler = stage2
# Now we can do the installation
install_packages: install_libexecs
-install_packages: rts/dist-install/package.conf.install mk/system-cxx-std-lib-1.0.conf.install
+install_packages: rts/dist-install/package.conf.install mk/system-cxx-std-lib-1.0.conf
$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
$(call removeTrees,"$(INSTALLED_PACKAGE_CONF)")
$(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"