From 19d5986dde92e800281aaa285fb7314fe2b79aad Mon Sep 17 00:00:00 2001 From: Paul Jarc Date: Thu, 20 Sep 2007 10:20:05 +0000 Subject: [PATCH] re PR bootstrap/31906 ("-Xcompiler" is inserted after "-Xlinker" when building libstdc++) 2007-09-20 Paul Jarc PR bootstrap/31906 * libtool-ldflags: Don't prefix arguments with -Xcompiler if they're already prefixed. From-SVN: r128617 --- ChangeLog | 6 ++++++ libtool-ldflags | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9d9940072f9..e57e59df468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-20 Paul Jarc + + PR bootstrap/31906 + * libtool-ldflags: Don't prefix arguments with -Xcompiler if + they're already prefixed. + 2007-09-19 Benjamin Kosnik * configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before diff --git a/libtool-ldflags b/libtool-ldflags index 6321747b4a9..e32e37bf10d 100755 --- a/libtool-ldflags +++ b/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