diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-08-06 14:50:15 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-08-07 04:48:54 -0400 |
| commit | 57ac1b1d252550a2e3f81421a52c72d8c3080860 (patch) | |
| tree | 4e08ea5a74621ce1403e7136c6bec29b3502a249 | |
| parent | 7b514848b8c9dfdd8455375e4e98c35a0d856749 (diff) | |
| download | haskell-wip/T21506.tar.gz | |
hadrian: Extend xattr Darwin hack to cover /libwip/T21506
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.
| -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 b922a60762..ae36185541 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -177,7 +177,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)" @@ -208,6 +210,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)" |