Merge from gcc:

2010-03-19 Jack Howarth <[email protected]> PR ada/42554 * configure.ac: Only pass -c to ranlib for darwin9 and earlier. * configure: Regenerate.
xdje42 · Mar 23, 2010 · 92f4e98 · 92f4e98
1 parent c35a055
commit 92f4e98
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-23  Joseph Myers  <[email protected]>
+
+	Merge from gcc:
+	2010-03-19  Jack Howarth <[email protected]>
+	PR ada/42554
+	* configure.ac: Only pass -c to ranlib for darwin9 and earlier.
+	* configure: Regenerate.
+
 2010-03-23  Joseph Myers  <[email protected]>
 
 	* config.sub: Update to version 2010-03-22.

diff --git 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
@@ -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)