diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-19 11:46:12 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-04-19 11:47:14 -0400 |
| commit | 18169cec783996946c372c8b6d63fb4d93c40651 (patch) | |
| tree | e0da9f0b95484d5430d3dc186c62eb9b757c5351 | |
| parent | d8392f6a714b5646d43ed54eee0d028f714da717 (diff) | |
| download | haskell-wip/T21402.tar.gz | |
hadrian: Don't rely on xxx not being present in installation pathwip/T21402
Previously Hadrian's installation makefile would assume that the string
`xxx` did not appear in the installation path. This would of course
break for some users.
Fixes #21402.
| -rw-r--r-- | hadrian/bindist/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index bac7011a84..d4e52f8c65 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -205,12 +205,12 @@ install_wrappers: install_bin_libdir $(foreach p, $(BINARY_NAMES),\ $(call installscript,$p,$(WrapperBinsDir)/$p,$(WrapperBinsDir),$(ActualBinsDir),$(ActualBinsDir)/$p,$(ActualLibsDir),$(docdir),$(includedir))) -PKG_CONFS = $(shell find "$(ActualLibsDir)/package.conf.d" -name '*.conf' | sed 's: :xxx:g') +PKG_CONFS = $(shell find "$(ActualLibsDir)/package.conf.d" -name '*.conf' | sed "s: :\0xxx\0:g") update_package_db: install_bin install_lib @echo "$(PKG_CONFS)" @echo "Updating the package DB" $(foreach p, $(PKG_CONFS),\ - $(call patchpackageconf,$(shell echo $(notdir $p) | sed 's/-\([0-9]*[0-9]\.\)*conf//g'),$(shell echo "$p" | sed 's:xxx: :g'),$(docdir),$(shell mk/relpath.sh "$(ActualLibsDir)" "$(docdir)"))) + $(call patchpackageconf,$(shell echo $(notdir $p) | sed 's/-\([0-9]*[0-9]\.\)*conf//g'),$(shell echo "$p" | sed 's:\0xxx\0: :g'),$(docdir),$(shell mk/relpath.sh "$(ActualLibsDir)" "$(docdir)"))) '$(WrapperBinsDir)/$(CrossCompilePrefix)ghc-pkg' recache install_mingw: |