diff options
author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:03:29 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:03:29 -0500 |
commit | 42a5896e24b901eeb849e4b01c0a721c981b65fd (patch) | |
tree | db55ce1c9f8bbf04b28b3da8160edaa36ef45fb1 | |
parent | 307dbc7f33171e31a0e0a02681c63574037820eb (diff) | |
download | bash-42a5896e24b901eeb849e4b01c0a721c981b65fd.tar.gz |
Bash-4.2 patch 20
-rw-r--r-- | patchlevel.h | 2 | ||||
-rwxr-xr-x | support/shobj-conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/patchlevel.h b/patchlevel.h index 8ce27281..cb416d34 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 19 +#define PATCHLEVEL 20 #endif /* _PATCHLEVEL_H_ */ diff --git a/support/shobj-conf b/support/shobj-conf index 5a63e80a..c61dc78b 100755 --- a/support/shobj-conf +++ b/support/shobj-conf @@ -157,7 +157,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*) ;; # Darwin/MacOS X -darwin[89]*|darwin10*) +darwin[89]*|darwin1[012]*) SHOBJ_STATUS=supported SHLIB_STATUS=supported @@ -186,7 +186,7 @@ darwin*|macosx*) SHLIB_LIBSUFF='dylib' case "${host_os}" in - darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' + darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ;; *) SHOBJ_LDFLAGS='-dynamic' |