summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2013-11-19 09:45:12 -0500
committerChet Ramey <chet.ramey@case.edu>2013-11-19 09:45:12 -0500
commit3fede80c7ae9d396a98137ec8e7188a27c327e96 (patch)
treeaf46c19055e97c4a5ad597cd11ac34dc04fa5826
parent9922d2d7608ea86ff9e42aca0d3342a92748873f (diff)
downloadreadline-3fede80c7ae9d396a98137ec8e7188a27c327e96.tar.gz
Readline-6.2 patch 5
-rw-r--r--patchlevel2
-rw-r--r--support/shobj-conf8
2 files changed, 6 insertions, 4 deletions
diff --git a/patchlevel b/patchlevel
index 626a945..e0ba09d 100644
--- a/patchlevel
+++ b/patchlevel
@@ -1,3 +1,3 @@
# Do not edit -- exists only for use by patch
-4
+5
diff --git a/support/shobj-conf b/support/shobj-conf
index c61dc78..cb3095c 100644
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -157,13 +157,15 @@ freebsd[4-9]*|freebsdelf*|dragonfly*)
;;
# Darwin/MacOS X
-darwin[89]*|darwin1[012]*)
+darwin[89]*|darwin1[0123]*)
SHOBJ_STATUS=supported
SHLIB_STATUS=supported
SHOBJ_CFLAGS='-fno-common'
- SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
+# SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
+ # we can finally kill Mac OS X 10.3
+ SHOBJ_LD='${CC}'
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
SHLIB_LIBSUFF='dylib'
@@ -186,7 +188,7 @@ darwin*|macosx*)
SHLIB_LIBSUFF='dylib'
case "${host_os}" in
- darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
+ darwin[789]*|darwin1[0123]*) 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'