summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-05-24 09:38:55 -0400
committerZubin Duggal <zubin.duggal@gmail.com>2022-07-11 11:25:55 +0530
commit15729fbe7cc6bea38555c5180293850957929b5d (patch)
treec4762169bc6810f2e97f5dba7b50a0e60137fc92
parentcd601182cbf8067d529deb95e08a8a029b41481d (diff)
downloadhaskell-15729fbe7cc6bea38555c5180293850957929b5d.tar.gz
hadrian: Run xattr -rc . on bindist tarball
Fixes #21506. (cherry picked from commit aa9d9381e5c5d7b96966d817372085897585ecdd)
-rw-r--r--hadrian/bindist/Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile
index 0e0b3e0add..33140eb764 100644
--- a/hadrian/bindist/Makefile
+++ b/hadrian/bindist/Makefile
@@ -16,6 +16,13 @@ default:
# TODO : find if a better function exists
eq=$(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+# the following is the work around suggested by @carter in #17418 during install
+# time. This should help us with code signing issues by removing extended
+# attributes from all files.
+ifeq "$(Darwin_Host)" "YES"
+XATTR ?= /usr/bin/xattr
+endif
+
define installscript
# $1 = package name
# $2 = wrapper path
@@ -158,6 +165,8 @@ install_bin_libdir:
for i in $(BINARIES); do \
cp -R $$i "$(DESTDIR)$(ActualBinsDir)"; \
done
+ # Work around #17418 on Darwin
+ if [ -e "${XATTR}" ]; then "${XATTR}" -c -r "$(DESTDIR)$(ActualBinsDir)"; fi
install_bin_direct:
@echo "Copying binaries to $(DESTDIR)$(WrapperBinsDir)"