| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Thu, 14 Jun 2012 09:20:26 +0200 | |
| branch | firefox14 |
| changeset 480 | f99d16f8b0f5 |
| parent 447 | 65c62d3dddac |
| permissions | -rw-r--r-- |
|
447
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Mike Hommey <mh+mozilla@glandium.org> |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# Date 1336991062 -7200 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
# Node ID 234d34706ea1a0e9a9d2c61561c4441590712df0 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
# Parent 0f2f145158b595f5242bf0d79b2de413373730c1 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
Bug 741348 - Work around crashreporter client build failure with gcc 4.7 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
|
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
@@ -65,8 +65,11 @@ HOST_CPPSRCS = \ |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
file_id.cc \ |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
guid_creator.cc \ |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
$(NULL) |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
# need static lib |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
FORCE_STATIC_LIB = 1 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
|
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
include $(topsrcdir)/config/rules.mk |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+ |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11 |
|
65c62d3dddac
fix crashreporter for gcc 4.7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+file_id.$(OBJ_SUFFIX): STL_FLAGS= |