diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-08-06 14:50:15 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-07 11:44:58 -0400 |
| commit | 78d04cfadfd728bb088b08b1e88905b43cc0360c (patch) | |
| tree | f640f3e8ae9bca49c6b524b7c4f0db8f031dffa9 /hadrian | |
| parent | b9bb45d7368ceeb874ded7e55e603327c103ce9f (diff) | |
| download | haskell-78d04cfadfd728bb088b08b1e88905b43cc0360c.tar.gz | |
hadrian: Extend xattr Darwin hack to cover /lib
As noted in #21506, it is now necessary to remove extended attributes
from `/lib` as well as `/bin` to avoid SIP issues on Darwin.
Fixes #21506.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/bindist/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index 35beeca759..94a74b2162 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -178,7 +178,9 @@ install_bin_libdir: $(INSTALL_PROGRAM) $$i "$(DESTDIR)$(ActualBinsDir)"; \ done # Work around #17418 on Darwin - if [ -e "${XATTR}" ]; then "${XATTR}" -c -r "$(DESTDIR)$(ActualBinsDir)"; fi + if [ -e "${XATTR}" ]; then \ + "${XATTR}" -c -r "$(DESTDIR)$(ActualBinsDir)"; \ + fi install_bin_direct: @echo "Copying binaries to $(DESTDIR)$(WrapperBinsDir)" @@ -209,6 +211,10 @@ install_lib: lib/settings esac; \ done; \ chmod ugo+rx "$$dest"/bin/* + # Work around #17418 on Darwin + if [ -e "${XATTR}" ]; then \ + "${XATTR}" -c -r "$(DESTDIR)$(ActualLibsDir)"; \ + fi install_docs: @echo "Copying docs to $(DESTDIR)$(docdir)" |