X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbindist.mk;h=c4ef66e290b0cd6e8c5dcb77fad677f1c0c96f24;hb=3710a4ef1ca665fe4ed705a6b0f4400d680c7b54;hp=7e5f31bbce6e688c6b12be015f96f15666341d44;hpb=9f3483fa8aaa7bfbf62f6a57b94a5b784b160123;p=ghc-hetmet.git

diff --git a/mk/bindist.mk b/mk/bindist.mk
index 7e5f31b..c4ef66e 100644
--- a/mk/bindist.mk
+++ b/mk/bindist.mk
@@ -25,7 +25,12 @@ endif
 	# Executables
 	-$(FIND) . -name "*.wrapper"                   -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
 	-$(FIND) $(EXE_DIST_DIR)/setup-config          -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
-	-$(FIND) $(EXE_DIST_DIR) -type f -perm /a+x    -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
+	# We want the executable files, which in theory would be -perm /a+x
+	# ("any execute bit is set") but that doesn't work on some solaris
+	# and OS X machines, so we use -perm -100 instead ("the user execute
+	# bit is set"). In practice, this is extremely unlikely not to be the
+	# same set of files.
+	-$(FIND) $(EXE_DIST_DIR) -type f -perm -100    -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null
 	# Docs
 	# This gives us both docbook docs, and haddock docs
 	$(FIND) . -name "*.haddock"                    -exec echo $(WHERE_AM_I)/{} \; >> $(BIN_DIST_LIST) 2> /dev/null