[Git][ghc/ghc][wip/ghc-9.4.5-backports] hadrian: Extend xattr Darwin hack to cover /lib
Zubin (@wz1000)
gitlab at gitlab.haskell.org
Tue Apr 11 08:15:45 UTC 2023
Zubin pushed to branch wip/ghc-9.4.5-backports at Glasgow Haskell Compiler / GHC
Commits:
cf444699 by Ben Gamari at 2023-04-11T13:45:29+05:30
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.
(cherry picked from commit 78d04cfadfd728bb088b08b1e88905b43cc0360c)
- - - - -
1 changed file:
- hadrian/bindist/Makefile
Changes:
=====================================
hadrian/bindist/Makefile
=====================================
@@ -147,7 +147,9 @@ install_bin_libdir:
fi; \
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)"
@@ -181,6 +183,10 @@ install_lib: lib/settings
for i in $(DOCS); do \
cp -R $$i "$(DESTDIR)$(docdir)/"; \
done
+ # Work around #17418 on Darwin
+ if [ -e "${XATTR}" ]; then \
+ "${XATTR}" -c -r "$(DESTDIR)$(ActualLibsDir)"; \
+ fi
install_docs:
@echo "Copying docs to $(DESTDIR)$(docdir)"
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf44469945d4059d70127c22372b9c2170dc9a34
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cf44469945d4059d70127c22372b9c2170dc9a34
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230411/706c123d/attachment-0001.html>
More information about the ghc-commits
mailing list