diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-25 09:42:49 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-07-15 22:22:52 -0400 |
| commit | 3e58f0ba8d10df12761eafe712e81be28c8051a1 (patch) | |
| tree | b3ca987652fd533f8f5734274a33dcf749c37be7 | |
| parent | d339b68fbefbc763d633b247736c6b64a8c57b7d (diff) | |
| download | haskell-3e58f0ba8d10df12761eafe712e81be28c8051a1.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
(cherry picked from commit 03cc5d0258294fc83f65479e78dbe937622cfc88)
| -rw-r--r-- | ghc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1007,7 +1007,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)" |