re PR bootstrap/31906 ("-Xcompiler" is inserted after "-Xlinker" when building libstdc++)

2007-09-20  Paul Jarc  <[email protected]>

	PR bootstrap/31906
	* libtool-ldflags: Don't prefix arguments with -Xcompiler if
        they're already prefixed.

From-SVN: r128617

Author: Paul Jarc

ChangeLog

@@ -1,3 +1,9 @@
+2007-09-20  Paul Jarc  <[email protected]>
+
+	PR bootstrap/31906
+	* libtool-ldflags: Don't prefix arguments with -Xcompiler if
+        they're already prefixed.
+
 2007-09-19  Benjamin Kosnik  <[email protected]>
 
 	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before

libtool-ldflags

@@ -31,6 +31,7 @@
 # The output of the script.  This string is built up as we process the
 # arguments.
 result=
+prev_arg=
 
 for arg
 do
@@ -43,13 +44,21 @@ do
 	    # options.  So, we prefix these options with -Xcompiler to
 	    # make clear to libtool that they are in fact compiler
 	    # options.
-	    result="$result -Xcompiler" 
+	    case $prev_arg in
+		-Xpreprocessor|-Xcompiler|-Xlinker)
+		    # This option is already prefixed; don't prefix it again.
+		    ;;
+		*)
+		    result="$result -Xcompiler"
+		    ;;
+	    esac
 	    ;;
 	*)
 	    # We do not want to add -Xcompiler to other options because
 	    # that would prevent libtool itself from recognizing them.
 	    ;;
     esac
+    prev_arg=$arg
 
     # If $(LDFLAGS) is (say):
     #   a "b'c d" e