diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-08-16 19:17:02 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-08-16 19:17:02 +0000 |
| commit | 402e5fb2ab2250cbef67b623e5777791ac37d855 (patch) | |
| tree | f260b04edc2a1932b8546c8a8c090872ccf39554 | |
| parent | 97cf64a7ee90e7835f723b369fa1f7a35dfdb202 (diff) | |
| download | zsh-402e5fb2ab2250cbef67b623e5777791ac37d855.tar.gz zsh-402e5fb2ab2250cbef67b623e5777791ac37d855.tar.xz zsh-402e5fb2ab2250cbef67b623e5777791ac37d855.zip | |
Hiramatsu Yoshifumi: 30621 patch-ac (from NetBSD pkgsrc)backported to configure.ac: compilation on interix, also
change linker flags for NetBSD.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index fe9154528..b870fa618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2012-08-16 Peter Stephenson <p.w.stephenson@ntlworld.com> + * Hiramatsu Yoshifumi: 30621 patch-ac (from NetBSD pkgsrc) + backported to configure.ac: compilation on interix, also + change linker flags for NetBSD. + * Hiramatsu Yoshifumi: 30621 patch-ab (from NetBSD pkgsrc): - compilation on __INTERIX + Src/zsh.h: compilation on __INTERIX 2012-08-16 Peter Stephenson <pws@csr.com> @@ -66,5 +70,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5697 $ +* $Revision: 1.5698 $ ***************************************************** diff --git a/configure.ac b/configure.ac index 6c0459747..04b2ce21a 100644 --- a/configure.ac +++ b/configure.ac @@ -2709,6 +2709,10 @@ char *argv[]; DLLD="${DLLD=$CC}" DLLDARG="" ;; + *interix*) + DLLD="${DLLD=$CC}" + DLLDARG="" + ;; * ) DLLD="${DLLD=ld}" DLLDARG="" @@ -2719,6 +2723,7 @@ char *argv[]; case "$host_os" in hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;; + interix*) DLCFLAGS="${DLCFLAGS=}" ;; *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;; esac else @@ -2733,10 +2738,9 @@ char *argv[]; fi case "$host_os" in osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;; - *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; + *freebsd*|*netbsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; - netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;; solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;; darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; |