From 92f4e989f6eda10ef771c68f99c23d59cce40dc8 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 23 Mar 2010 14:30:59 +0000 Subject: [PATCH] Merge from gcc: 2010-03-19 Jack Howarth PR ada/42554 * configure.ac: Only pass -c to ranlib for darwin9 and earlier. * configure: Regenerate. --- ChangeLog | 8 ++++++++ configure | 4 ++-- configure.ac | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56fcc6c3d05..ad208a1fe55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-03-23 Joseph Myers + + Merge from gcc: + 2010-03-19 Jack Howarth + PR ada/42554 + * configure.ac: Only pass -c to ranlib for darwin9 and earlier. + * configure: Regenerate. + 2010-03-23 Joseph Myers * config.sub: Update to version 2010-03-22. diff --git a/configure b/configure index f3212128d00..508d958960b 100755 --- a/configure +++ b/configure @@ -7292,8 +7292,8 @@ case "${target}" in extra_arflags_for_target=" -X32_64" extra_nmflags_for_target=" -B -X32_64" ;; - *-*-darwin*) - # ranlib from Darwin requires the -c flag to look at common symbols. + *-*-darwin[3-9]*) + # ranlib before Darwin10 requires the -c flag to look at common symbols. extra_ranlibflags_for_target=" -c" ;; mips*-*-pe | sh*-*-pe | *arm-wince-pe) diff --git a/configure.ac b/configure.ac index 92f3a9062c2..a5d75ee71d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2405,8 +2405,8 @@ case "${target}" in extra_arflags_for_target=" -X32_64" extra_nmflags_for_target=" -B -X32_64" ;; - *-*-darwin*) - # ranlib from Darwin requires the -c flag to look at common symbols. + *-*-darwin[[3-9]]*) + # ranlib before Darwin10 requires the -c flag to look at common symbols. extra_ranlibflags_for_target=" -c" ;; mips*-*-pe | sh*-*-pe | *arm-wince-pe) -- 2.30.2