author | Wolfgang Rosenauer <wr@rosenauer.org> |
Fri, 12 Aug 2011 08:47:59 +0200 | |
branch | mozilla-1.9.2 |
changeset 299 | 9a09a02dff60 |
child 382 | 67f876aafae8 |
permissions | -rw-r--r-- |
299
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# Parent e589abb2c4d6aaa6083d254416211ac90360dbdd |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
NO-BUG: Ignore a hack which is not needed in distribution build environments. |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
|
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
@@ -59,11 +59,11 @@ HOST_LIBS += \ |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
$(NULL) |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
|
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
# force C++ linking |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
CPP_PROG_LINK = 1 |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
FORCE_USE_PIC = 1 |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
|
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
# due to them having an older libstdc++ |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
-HOST_LDFLAGS += -static |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+#HOST_LDFLAGS += -static |
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
|
9a09a02dff60
update to 1.9.2.20/3.6.20
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
include $(topsrcdir)/config/rules.mk |