about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2001-09-27 15:50:15 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2001-09-27 15:50:15 +0000
commita886f098944f183e0fc70bb3672cbef0f4e18b6b (patch)
tree63e9f07fb44621741fd7dec93c0a39aebee1fb0e
parent8c05772007d403450624056cd24f8d53efa2da70 (diff)
downloadzsh-a886f098944f183e0fc70bb3672cbef0f4e18b6b.tar.gz
zsh-a886f098944f183e0fc70bb3672cbef0f4e18b6b.tar.xz
zsh-a886f098944f183e0fc70bb3672cbef0f4e18b6b.zip
fix build and test problems in Mac OS X (15882)
-rw-r--r--ChangeLog5
-rw-r--r--Etc/MACHINES3
-rw-r--r--Test/C02cond.ztst4
-rw-r--r--zshconfig.ac1
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a2b1081d..f5f8b1782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-27  Oliver Kiddle  <opk@zsh.org>
+
+	* 15882: zshconfig.ac, Etc/MACHINES, Test/C02cond.ztst: fix
+	build and test problems on MacOS X (Darwin).
+
 2001-09-27  Clint Adams  <clint@zsh.org>
 
 	* 15886: Src/Modules/tcp.c: use select if poll
diff --git a/Etc/MACHINES b/Etc/MACHINES
index 22f7e7c03..eba4cb77c 100644
--- a/Etc/MACHINES
+++ b/Etc/MACHINES
@@ -17,6 +17,9 @@ The format of entries is thus:
 Machines
 --------
 
+Apple: MacOS X/Darwin 1.4
+	Should build `out-of-the-box'. Dynamic loading does not work.
+
 Red Hat Inc.: Cygwin
 	Should build `out-of-the-box'.  The compilation directory should
 	be on a file system mounted as binary (the mount command shows
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index 94c86789d..83f9b6de3 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -18,9 +18,7 @@
   mkdir modish
   chgrp $EGID modish
 
-  chmod g+xs modish
-  chmod u+s modish
-  chmod +t modish
+  chmod 7710 modish  # g+xs,u+s,+t
 
   touch unmodish
   chmod 000 unmodish
diff --git a/zshconfig.ac b/zshconfig.ac
index c01421c41..a3442e4be 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -307,6 +307,7 @@ fi
 if test -n "$auto_ldflags"; then
   case "${enable_zsh_debug}$host_os" in
     yesaix*|yeshpux*|yesnetbsd*|yesopenbsd*) ;;  # "ld -g" is not valid on these systems
+    darwin*) LDFLAGS=-Wl,-x ;;
     yes*)    LDFLAGS=-g ;;
     *)       LDFLAGS=-s ;;
   esac