diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index dcd49d071d6..fc5871ad30d 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-13  Ian Lance Taylor  <iant@google.com>
+
+	PR other/55312
+	* configure.ac: Only add -Werror if building a target library.
+
 2012-11-12  Ian Lance Taylor  <iant@google.com>
 	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 	    Gerald Pfeifer  <gerald@pfeifer.com>
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 2a57c5102f3..737e81b92df 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -11575,7 +11575,7 @@ fi
 CFLAGS="$save_CFLAGS"
 
 
-if test "x$GCC" = "xyes"; then
+if test -n "${with_target_subdir}"; then
   WARN_FLAGS="$WARN_FLAGS -Werror"
 fi
 
diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac
index c9cba3e4e9c..243ce22582f 100644
--- a/libbacktrace/configure.ac
+++ b/libbacktrace/configure.ac
@@ -120,7 +120,7 @@ ACX_PROG_CC_WARNING_OPTS([-W -Wall -Wwrite-strings -Wstrict-prototypes \
 			  -Wmissing-format-attribute -Wcast-qual],
 			  [WARN_FLAGS])
 
-if test "x$GCC" = "xyes"; then
+if test -n "${with_target_subdir}"; then
   WARN_FLAGS="$WARN_FLAGS -Werror"
 fi