author | Wolfgang Rosenauer <wr@rosenauer.org> |
Mon, 18 Jan 2010 18:36:29 +0100 | |
changeset 53 | 770c275fd27c |
parent 46 | c743908ffe6f |
permissions | -rw-r--r-- |
43
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
diff --git a/profile/dirserviceprovider/src/nsProfileLock.cpp b/profile/dirserviceprovider/src/nsProfileLock.cpp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
--- a/profile/dirserviceprovider/src/nsProfileLock.cpp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
+++ b/profile/dirserviceprovider/src/nsProfileLock.cpp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
@@ -154,17 +154,18 @@ void nsProfileLock::RemovePidLockFiles() |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
static struct sigaction SIGHUP_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
static struct sigaction SIGINT_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
static struct sigaction SIGQUIT_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
static struct sigaction SIGILL_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
static struct sigaction SIGABRT_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
static struct sigaction SIGSEGV_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
static struct sigaction SIGTERM_oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
-void nsProfileLock::FatalSignalHandler(int signo) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
+void nsProfileLock::FatalSignalHandler(int signo, siginfo_t *info, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
+ void *context) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
{ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
// Remove any locks still held. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
RemovePidLockFiles(); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
// Chain to the old handler, which may exit. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
struct sigaction *oldact = nsnull; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
switch (signo) { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
@@ -206,16 +207,20 @@ void nsProfileLock::FatalSignalHandler(i |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
sigset_t unblock_sigs; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
sigemptyset(&unblock_sigs); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
sigaddset(&unblock_sigs, signo); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
sigprocmask(SIG_UNBLOCK, &unblock_sigs, NULL); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
raise(signo); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
} |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
+ else if (oldact->sa_sigaction && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
+ (oldact->sa_flags & SA_SIGINFO) == SA_SIGINFO) { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
+ oldact->sa_sigaction(signo, info, context); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
else if (oldact->sa_handler && oldact->sa_handler != SIG_IGN) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
{ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
oldact->sa_handler(signo); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
} |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
} |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
// Backstop exit call, just in case. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
_exit(signo); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
@@ -382,18 +387,18 @@ nsresult nsProfileLock::LockWithSymlink( |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
// Clean up on normal termination. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
atexit(RemovePidLockFiles); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
// Clean up on abnormal termination, using POSIX sigaction. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
// Don't arm a handler if the signal is being ignored, e.g., |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
// because mozilla is run via nohup. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
if (!sDisableSignalHandling) { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
struct sigaction act, oldact; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
- act.sa_handler = FatalSignalHandler; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
- act.sa_flags = 0; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
+ act.sa_sigaction = FatalSignalHandler; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
+ act.sa_flags = SA_SIGINFO; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
sigfillset(&act.sa_mask); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
#define CATCH_SIGNAL(signame) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
PR_BEGIN_MACRO \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
if (sigaction(signame, NULL, &oldact) == 0 && \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
oldact.sa_handler != SIG_IGN) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
{ \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
sigaction(signame, &act, &signame##_oldact); \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
diff --git a/profile/dirserviceprovider/src/nsProfileLock.h b/profile/dirserviceprovider/src/nsProfileLock.h |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
--- a/profile/dirserviceprovider/src/nsProfileLock.h |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
+++ b/profile/dirserviceprovider/src/nsProfileLock.h |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
@@ -50,16 +50,17 @@ class nsIProfileUnlocker; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
#if defined (XP_OS2) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
#define INCL_DOSERRORS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
#define INCL_DOSFILEMGR |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
#include <os2.h> |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
#endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
#if defined (XP_UNIX) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
+#include <signal.h> |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
#include "prclist.h" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
#endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
class nsProfileLock |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
#if defined (XP_UNIX) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
: public PRCList |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
#endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
{ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
@@ -87,17 +88,18 @@ private: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
PRPackedBool mHaveLock; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
#if defined (XP_WIN) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
HANDLE mLockFileHandle; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
#elif defined (XP_OS2) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
LHANDLE mLockFileHandle; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
#elif defined (XP_UNIX) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
static void RemovePidLockFiles(); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
- static void FatalSignalHandler(int signo); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
+ static void FatalSignalHandler(int signo, siginfo_t *info, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
+ void *context); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
static PRCList mPidLockList; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
nsresult LockWithFcntl(const nsACString& lockFilePath); |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
/** |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
* @param aHaveFcntlLock if true, we've already acquired an fcntl lock so this |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
* lock is merely an "obsolete" lock to keep out old Firefoxes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
*/ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
--- a/toolkit/crashreporter/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
+++ b/toolkit/crashreporter/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
@@ -77,16 +77,17 @@ endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
ifeq ($(OS_ARCH),Linux) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
# there's no define for this normally |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
DEFINES += -DXP_LINUX |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
DIRS += \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
google-breakpad/src/common \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
google-breakpad/src/common/linux \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
google-breakpad/src/client \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
google-breakpad/src/client/linux/handler \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
119 |
+ google-breakpad/src/client/linux/minidump_writer \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
google-breakpad/src/tools/linux/dump_syms \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
$(NULL) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
124 |
ifeq ($(OS_ARCH),SunOS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
125 |
# there's no define for this normally |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
126 |
DEFINES += -DXP_SOLARIS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
DIRS += \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
128 |
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
--- a/toolkit/crashreporter/client/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
130 |
+++ b/toolkit/crashreporter/client/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
@@ -80,29 +80,27 @@ endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
ifeq ($(OS_ARCH),Linux) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
CPPSRCS += crashreporter_linux.cpp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
LIBS += \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
$(NULL) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
LOCAL_INCLUDES += -I$(srcdir) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
140 |
-CPPSRCS += http_upload.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
FORCE_USE_PIC=1 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
ifeq ($(OS_ARCH),SunOS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
CPPSRCS += crashreporter_linux.cpp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
LIBS += \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
$(NULL) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
LOCAL_INCLUDES += -I$(srcdir) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
151 |
OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
152 |
-CPPSRCS += http_upload.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
153 |
FORCE_USE_PIC=1 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
include $(topsrcdir)/config/rules.mk |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
157 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
158 |
ifeq ($(OS_ARCH),Darwin) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
159 |
libs:: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
160 |
$(NSINSTALL) -D $(DIST)/bin/crashreporter.app |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
161 |
@@ -110,14 +108,11 @@ libs:: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
162 |
sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
163 |
iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
164 |
$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
165 |
$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
166 |
rm -f $(DIST)/bin/crashreporter |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
167 |
endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
168 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
169 |
ifeq (,$(filter-out Linux SunOS,$(OS_ARCH))) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
170 |
-export:: $(srcdir)/../google-breakpad/src/common/linux/http_upload.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
- $(INSTALL) $^ . |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
libs:: $(topsrcdir)/toolkit/themes/winstripe/global/throbber/Throbber-small.gif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
174 |
$(INSTALL) $^ $(DIST)/bin |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
175 |
endif |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
176 |
diff --git a/toolkit/crashreporter/google-breakpad/Makefile.am b/toolkit/crashreporter/google-breakpad/Makefile.am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
177 |
--- a/toolkit/crashreporter/google-breakpad/Makefile.am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
178 |
+++ b/toolkit/crashreporter/google-breakpad/Makefile.am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
179 |
@@ -90,16 +90,18 @@ src_libbreakpad_la_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
180 |
src/processor/range_map.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
181 |
src/processor/scoped_ptr.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
182 |
src/processor/simple_symbol_supplier.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
183 |
src/processor/simple_symbol_supplier.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
src/processor/stack_frame_info.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
src/processor/stackwalker.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
src/processor/stackwalker_amd64.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
187 |
src/processor/stackwalker_amd64.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
+ src/processor/stackwalker_arm.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
+ src/processor/stackwalker_arm.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
src/processor/stackwalker_ppc.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
src/processor/stackwalker_ppc.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
192 |
src/processor/stackwalker_sparc.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
src/processor/stackwalker_sparc.h \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
src/processor/stackwalker_x86.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
src/processor/stackwalker_x86.h |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
@@ -110,16 +112,17 @@ bin_PROGRAMS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
199 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
200 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
201 |
## Tests |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
check_PROGRAMS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
203 |
src/processor/address_map_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
src/processor/basic_source_line_resolver_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
src/processor/contained_range_map_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
src/processor/minidump_processor_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ src/processor/minidump_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
src/processor/pathname_stripper_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
src/processor/postfix_evaluator_unittest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
src/processor/range_map_unittest |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
212 |
if SELFTEST |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
213 |
check_PROGRAMS += \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
214 |
src/processor/stackwalker_selftest |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
endif SELFTEST |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
216 |
@@ -147,32 +150,55 @@ src_processor_basic_source_line_resolver |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
218 |
src_processor_contained_range_map_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
219 |
src/processor/contained_range_map_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
src_processor_contained_range_map_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
221 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
src_processor_minidump_processor_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
- src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
226 |
+ src/processor/minidump_processor_unittest.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
+ src/testing/gtest/src/gtest-all.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
+ src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
229 |
+src_processor_minidump_processor_unittest_CPPFLAGS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
+ -I$(top_srcdir)/src/testing/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
231 |
+ -I$(top_srcdir)/src/testing/gtest/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
232 |
+ -I$(top_srcdir)/src/testing/gtest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
233 |
+ -I$(top_srcdir)/src/testing |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
234 |
src_processor_minidump_processor_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
235 |
src/processor/basic_code_modules.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
236 |
src/processor/basic_source_line_resolver.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
237 |
src/processor/call_stack.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
238 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
src/processor/minidump_processor.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
src/processor/pathname_stripper.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
src/processor/process_state.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
src/processor/stackwalker.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
src/processor/stackwalker_amd64.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
+ src/processor/stackwalker_arm.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
src/processor/stackwalker_ppc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
src/processor/stackwalker_sparc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
src/processor/stackwalker_x86.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
250 |
+src_processor_minidump_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
251 |
+ src/processor/minidump_unittest.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
252 |
+ src/testing/gtest/src/gtest-all.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
253 |
+ src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
254 |
+src_processor_minidump_unittest_CPPFLAGS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
255 |
+ -I$(top_srcdir)/src/testing/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
256 |
+ -I$(top_srcdir)/src/testing/gtest/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
257 |
+ -I$(top_srcdir)/src/testing/gtest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
258 |
+ -I$(top_srcdir)/src/testing |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
259 |
+src_processor_minidump_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
+ src/processor/basic_code_modules.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
+ src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
262 |
+ src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
+ src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
264 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
265 |
src_processor_pathname_stripper_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
266 |
src/processor/pathname_stripper_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
267 |
src_processor_pathname_stripper_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
268 |
src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
269 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
270 |
src_processor_postfix_evaluator_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
271 |
src/processor/postfix_evaluator_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
272 |
src_processor_postfix_evaluator_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
273 |
@@ -191,16 +217,17 @@ src_processor_stackwalker_selftest_LDADD |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
274 |
src/processor/basic_code_modules.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
275 |
src/processor/basic_source_line_resolver.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
276 |
src/processor/call_stack.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
277 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
278 |
src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
279 |
src/processor/pathname_stripper.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
280 |
src/processor/stackwalker.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
281 |
src/processor/stackwalker_amd64.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
+ src/processor/stackwalker_arm.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
283 |
src/processor/stackwalker_ppc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
src/processor/stackwalker_sparc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
src/processor/stackwalker_x86.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
287 |
## Non-installables |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
noinst_PROGRAMS = |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
289 |
noinst_SCRIPTS = $(check_SCRIPTS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
290 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
291 |
@@ -221,16 +248,17 @@ src_processor_minidump_stackwalk_LDADD = |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
293 |
src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
294 |
src/processor/minidump_processor.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
295 |
src/processor/pathname_stripper.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
296 |
src/processor/process_state.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
297 |
src/processor/simple_symbol_supplier.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
298 |
src/processor/stackwalker.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
299 |
src/processor/stackwalker_amd64.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
300 |
+ src/processor/stackwalker_arm.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
301 |
src/processor/stackwalker_ppc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
302 |
src/processor/stackwalker_sparc.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
303 |
src/processor/stackwalker_x86.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
304 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
305 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
306 |
## Additional files to be included in a source distribution |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
307 |
## |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
308 |
## find src/client src/common src/processor/testdata src/tools \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
309 |
diff --git a/toolkit/crashreporter/google-breakpad/Makefile.in b/toolkit/crashreporter/google-breakpad/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
310 |
--- a/toolkit/crashreporter/google-breakpad/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
311 |
+++ b/toolkit/crashreporter/google-breakpad/Makefile.in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
312 |
@@ -142,18 +142,19 @@ src_processor_contained_range_map_unitte |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
313 |
src/processor/logging.lo src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
314 |
am_src_processor_minidump_dump_OBJECTS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
315 |
src/processor/minidump_dump.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
316 |
src_processor_minidump_dump_OBJECTS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
317 |
$(am_src_processor_minidump_dump_OBJECTS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
318 |
src_processor_minidump_dump_DEPENDENCIES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
319 |
src/processor/basic_code_modules.lo src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
320 |
src/processor/minidump.lo src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
321 |
-am_src_processor_minidump_processor_unittest_OBJECTS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
322 |
- src/processor/minidump_processor_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
323 |
+am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
324 |
+ src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
325 |
+ src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
326 |
src_processor_minidump_processor_unittest_OBJECTS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
327 |
$(am_src_processor_minidump_processor_unittest_OBJECTS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
328 |
src_processor_minidump_processor_unittest_DEPENDENCIES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
329 |
src/processor/basic_code_modules.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
330 |
src/processor/basic_source_line_resolver.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
331 |
src/processor/call_stack.lo src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
332 |
src/processor/minidump_processor.lo src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
333 |
src/processor/pathname_stripper.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
334 |
@@ -284,16 +285,17 @@ CPP = @CPP@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
335 |
CPPFLAGS = @CPPFLAGS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
336 |
CXX = @CXX@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
337 |
CXXCPP = @CXXCPP@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
338 |
CXXDEPMODE = @CXXDEPMODE@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
339 |
CXXFLAGS = @CXXFLAGS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
340 |
CYGPATH_W = @CYGPATH_W@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
341 |
DEFS = @DEFS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
342 |
DEPDIR = @DEPDIR@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
343 |
+DSYMUTIL = @DSYMUTIL@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
344 |
ECHO = @ECHO@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
345 |
ECHO_C = @ECHO_C@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
346 |
ECHO_N = @ECHO_N@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
347 |
ECHO_T = @ECHO_T@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
348 |
EGREP = @EGREP@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
349 |
EXEEXT = @EXEEXT@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
350 |
F77 = @F77@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
351 |
FFLAGS = @FFLAGS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
352 |
@@ -307,25 +309,27 @@ LDFLAGS = @LDFLAGS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
353 |
LIBOBJS = @LIBOBJS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
354 |
LIBS = @LIBS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
355 |
LIBTOOL = @LIBTOOL@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
356 |
LIBTOOL_DEPS = @LIBTOOL_DEPS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
357 |
LN_S = @LN_S@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
358 |
LTLIBOBJS = @LTLIBOBJS@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
359 |
MAKEINFO = @MAKEINFO@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
360 |
MKDIR_P = @MKDIR_P@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
361 |
+NMEDIT = @NMEDIT@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
362 |
OBJEXT = @OBJEXT@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
363 |
PACKAGE = @PACKAGE@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
364 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
365 |
PACKAGE_NAME = @PACKAGE_NAME@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
366 |
PACKAGE_STRING = @PACKAGE_STRING@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
367 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
368 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
369 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
370 |
RANLIB = @RANLIB@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
371 |
+SED = @SED@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
372 |
SET_MAKE = @SET_MAKE@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
373 |
SHELL = @SHELL@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
374 |
STRIP = @STRIP@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
375 |
VERSION = @VERSION@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
376 |
abs_builddir = @abs_builddir@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
377 |
abs_srcdir = @abs_srcdir@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
378 |
abs_top_builddir = @abs_top_builddir@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
379 |
abs_top_srcdir = @abs_top_srcdir@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
380 |
@@ -466,17 +470,25 @@ src_processor_basic_source_line_resolver |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
381 |
src_processor_contained_range_map_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
382 |
src/processor/contained_range_map_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
383 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
384 |
src_processor_contained_range_map_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
385 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
386 |
src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
387 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
388 |
src_processor_minidump_processor_unittest_SOURCES = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
389 |
- src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
390 |
+ src/processor/minidump_processor_unittest.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
391 |
+ src/testing/gtest/src/gtest-all.cc \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
392 |
+ src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
393 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
394 |
+src_processor_minidump_processor_unittest_CPPFLAGS = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
395 |
+ -I$(top_srcdir)/src/testing/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
396 |
+ -I$(top_srcdir)/src/testing/gtest/include \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
397 |
+ -I$(top_srcdir)/src/testing/gtest \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
398 |
+ -I$(top_srcdir)/src/testing |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
399 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
400 |
src_processor_minidump_processor_unittest_LDADD = \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
401 |
src/processor/basic_code_modules.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
402 |
src/processor/basic_source_line_resolver.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
403 |
src/processor/call_stack.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
404 |
src/processor/logging.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
405 |
src/processor/minidump_processor.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
406 |
src/processor/minidump.lo \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
407 |
@@ -866,19 +878,37 @@ src/processor/contained_range_map_unitte |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
408 |
src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
409 |
@rm -f src/processor/contained_range_map_unittest$(EXEEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
410 |
$(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
411 |
src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
412 |
src/processor/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
413 |
src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
414 |
@rm -f src/processor/minidump_dump$(EXEEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
415 |
$(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
416 |
-src/processor/minidump_processor_unittest.$(OBJEXT): \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
417 |
+src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT): \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
418 |
src/processor/$(am__dirstamp) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
419 |
src/processor/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
420 |
+src/testing/gtest/src/$(am__dirstamp): |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
421 |
+ @$(MKDIR_P) src/testing/gtest/src |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
422 |
+ @: > src/testing/gtest/src/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
423 |
+src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp): |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
424 |
+ @$(MKDIR_P) src/testing/gtest/src/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
425 |
+ @: > src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
426 |
+src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT): \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
427 |
+ src/testing/gtest/src/$(am__dirstamp) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
428 |
+ src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
429 |
+src/testing/src/$(am__dirstamp): |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
430 |
+ @$(MKDIR_P) src/testing/src |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
431 |
+ @: > src/testing/src/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
432 |
+src/testing/src/$(DEPDIR)/$(am__dirstamp): |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
433 |
+ @$(MKDIR_P) src/testing/src/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
434 |
+ @: > src/testing/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
435 |
+src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT): \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
436 |
+ src/testing/src/$(am__dirstamp) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
437 |
+ src/testing/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
438 |
src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
439 |
@rm -f src/processor/minidump_processor_unittest$(EXEEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
440 |
$(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
441 |
src/processor/minidump_stackwalk.$(OBJEXT): \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
442 |
src/processor/$(am__dirstamp) \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
443 |
src/processor/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
444 |
src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
445 |
@rm -f src/processor/minidump_stackwalk$(EXEEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
446 |
@@ -921,66 +951,70 @@ mostlyclean-compile: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
447 |
-rm -f src/processor/contained_range_map_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
448 |
-rm -f src/processor/logging.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
449 |
-rm -f src/processor/logging.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
450 |
-rm -f src/processor/minidump.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
451 |
-rm -f src/processor/minidump.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
452 |
-rm -f src/processor/minidump_dump.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
453 |
-rm -f src/processor/minidump_processor.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
454 |
-rm -f src/processor/minidump_processor.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
455 |
- -rm -f src/processor/minidump_processor_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
456 |
-rm -f src/processor/minidump_stackwalk.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
457 |
-rm -f src/processor/pathname_stripper.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
458 |
-rm -f src/processor/pathname_stripper.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
459 |
-rm -f src/processor/pathname_stripper_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
460 |
-rm -f src/processor/postfix_evaluator_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
461 |
-rm -f src/processor/process_state.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
462 |
-rm -f src/processor/process_state.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
463 |
-rm -f src/processor/range_map_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
464 |
-rm -f src/processor/simple_symbol_supplier.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
465 |
-rm -f src/processor/simple_symbol_supplier.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
466 |
+ -rm -f src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
467 |
-rm -f src/processor/stackwalker.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
468 |
-rm -f src/processor/stackwalker.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
469 |
-rm -f src/processor/stackwalker_amd64.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
470 |
-rm -f src/processor/stackwalker_amd64.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
471 |
-rm -f src/processor/stackwalker_ppc.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
472 |
-rm -f src/processor/stackwalker_ppc.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
473 |
-rm -f src/processor/stackwalker_selftest.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
474 |
-rm -f src/processor/stackwalker_sparc.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
475 |
-rm -f src/processor/stackwalker_sparc.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
476 |
-rm -f src/processor/stackwalker_x86.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
477 |
-rm -f src/processor/stackwalker_x86.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
478 |
+ -rm -f src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
479 |
+ -rm -f src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
480 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
481 |
distclean-compile: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
482 |
-rm -f *.tab.c |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
483 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
484 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/address_map_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
485 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_code_modules.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
486 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_source_line_resolver.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
487 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_source_line_resolver_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
488 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/call_stack.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
489 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/contained_range_map_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
490 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/logging.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
491 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
492 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_dump.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
493 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
494 |
-@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
495 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_stackwalk.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
496 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/pathname_stripper.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
497 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/pathname_stripper_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
498 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/postfix_evaluator_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
499 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/process_state.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
500 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/range_map_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
501 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/simple_symbol_supplier.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
502 |
+@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
503 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
504 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_amd64.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
505 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_ppc.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
506 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_selftest.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
507 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_sparc.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
508 |
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_x86.Plo@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
509 |
+@AMDEP_TRUE@@am__include@ @am__quote@src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
510 |
+@AMDEP_TRUE@@am__include@ @am__quote@src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po@am__quote@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
511 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
512 |
.cc.o: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
513 |
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
514 |
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
515 |
@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
516 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
517 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
518 |
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
519 |
@@ -996,16 +1030,58 @@ distclean-compile: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
520 |
.cc.lo: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
521 |
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
522 |
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
523 |
@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
524 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
525 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
526 |
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
527 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
528 |
+src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o: src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
529 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o -MD -MP -MF src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o `test -f 'src/processor/minidump_processor_unittest.cc' || echo '$(srcdir)/'`src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
530 |
+@am__fastdepCXX_TRUE@ mv -f src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
531 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/processor/minidump_processor_unittest.cc' object='src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
532 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
533 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o `test -f 'src/processor/minidump_processor_unittest.cc' || echo '$(srcdir)/'`src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
534 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
535 |
+src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj: src/processor/minidump_processor_unittest.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
536 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj -MD -MP -MF src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj `if test -f 'src/processor/minidump_processor_unittest.cc'; then $(CYGPATH_W) 'src/processor/minidump_processor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/minidump_processor_unittest.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
537 |
+@am__fastdepCXX_TRUE@ mv -f src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
538 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/processor/minidump_processor_unittest.cc' object='src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
539 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
540 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj `if test -f 'src/processor/minidump_processor_unittest.cc'; then $(CYGPATH_W) 'src/processor/minidump_processor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/minidump_processor_unittest.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
541 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
542 |
+src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o: src/testing/gtest/src/gtest-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
543 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o -MD -MP -MF src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o `test -f 'src/testing/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`src/testing/gtest/src/gtest-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
544 |
+@am__fastdepCXX_TRUE@ mv -f src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
545 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/testing/gtest/src/gtest-all.cc' object='src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
546 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
547 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o `test -f 'src/testing/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`src/testing/gtest/src/gtest-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
548 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
549 |
+src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj: src/testing/gtest/src/gtest-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
550 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj -MD -MP -MF src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj `if test -f 'src/testing/gtest/src/gtest-all.cc'; then $(CYGPATH_W) 'src/testing/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/gtest/src/gtest-all.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
551 |
+@am__fastdepCXX_TRUE@ mv -f src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
552 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/testing/gtest/src/gtest-all.cc' object='src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
553 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
554 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj `if test -f 'src/testing/gtest/src/gtest-all.cc'; then $(CYGPATH_W) 'src/testing/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/gtest/src/gtest-all.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
555 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
556 |
+src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o: src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
557 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o -MD -MP -MF src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o `test -f 'src/testing/src/gmock-all.cc' || echo '$(srcdir)/'`src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
558 |
+@am__fastdepCXX_TRUE@ mv -f src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
559 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/testing/src/gmock-all.cc' object='src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
560 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
561 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o `test -f 'src/testing/src/gmock-all.cc' || echo '$(srcdir)/'`src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
562 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
563 |
+src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj: src/testing/src/gmock-all.cc |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
564 |
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj -MD -MP -MF src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj `if test -f 'src/testing/src/gmock-all.cc'; then $(CYGPATH_W) 'src/testing/src/gmock-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/src/gmock-all.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
565 |
+@am__fastdepCXX_TRUE@ mv -f src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
566 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/testing/src/gmock-all.cc' object='src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj' libtool=no @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
567 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
568 |
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj `if test -f 'src/testing/src/gmock-all.cc'; then $(CYGPATH_W) 'src/testing/src/gmock-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/src/gmock-all.cc'; fi` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
569 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
570 |
mostlyclean-libtool: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
571 |
-rm -f *.lo |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
572 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
573 |
clean-libtool: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
574 |
-rm -rf .libs _libs |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
575 |
-rm -rf src/.libs src/_libs |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
576 |
-rm -rf src/processor/.libs src/processor/_libs |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
577 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
578 |
@@ -1304,29 +1380,33 @@ mostlyclean-generic: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
579 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
580 |
clean-generic: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
581 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
582 |
distclean-generic: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
583 |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
584 |
-rm -f src/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
585 |
-rm -f src/processor/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
586 |
-rm -f src/processor/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
587 |
+ -rm -f src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
588 |
+ -rm -f src/testing/gtest/src/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
589 |
+ -rm -f src/testing/src/$(DEPDIR)/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
590 |
+ -rm -f src/testing/src/$(am__dirstamp) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
591 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
592 |
maintainer-clean-generic: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
593 |
@echo "This command is intended for maintainers to use" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
594 |
@echo "it deletes files that may require special tools to rebuild." |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
595 |
clean: clean-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
596 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
597 |
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
598 |
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
599 |
mostlyclean-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
600 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
601 |
distclean: distclean-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
602 |
-rm -f $(am__CONFIG_DISTCLEAN_FILES) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
603 |
- -rm -rf src/processor/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
604 |
+ -rm -rf src/processor/$(DEPDIR) src/testing/gtest/src/$(DEPDIR) src/testing/src/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
605 |
-rm -f Makefile |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
606 |
distclean-am: clean-am distclean-compile distclean-generic \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
607 |
distclean-hdr distclean-libtool distclean-tags |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
608 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
609 |
dvi: dvi-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
610 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
611 |
dvi-am: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
612 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
613 |
@@ -1352,17 +1432,17 @@ install-pdf: install-pdf-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
614 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
615 |
install-ps: install-ps-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
616 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
617 |
installcheck-am: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
618 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
619 |
maintainer-clean: maintainer-clean-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
620 |
-rm -f $(am__CONFIG_DISTCLEAN_FILES) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
621 |
-rm -rf $(top_srcdir)/autom4te.cache |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
622 |
- -rm -rf src/processor/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
623 |
+ -rm -rf src/processor/$(DEPDIR) src/testing/gtest/src/$(DEPDIR) src/testing/src/$(DEPDIR) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
624 |
-rm -f Makefile |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
625 |
maintainer-clean-am: distclean-am maintainer-clean-generic |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
626 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
627 |
mostlyclean: mostlyclean-am |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
628 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
629 |
mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
630 |
mostlyclean-libtool |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
631 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
632 |
diff --git a/toolkit/crashreporter/google-breakpad/aclocal.m4 b/toolkit/crashreporter/google-breakpad/aclocal.m4 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
633 |
--- a/toolkit/crashreporter/google-breakpad/aclocal.m4 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
634 |
+++ b/toolkit/crashreporter/google-breakpad/aclocal.m4 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
635 |
@@ -13,17 +13,17 @@ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
636 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
637 |
m4_if(m4_PACKAGE_VERSION, [2.61],, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
638 |
[m4_fatal([this file was generated for autoconf 2.61. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
639 |
You have another version of autoconf. If you want to use that, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
640 |
you should regenerate the build system entirely.], [63])]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
641 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
642 |
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
643 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
644 |
-# serial 48 AC_PROG_LIBTOOL |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
645 |
+# serial 52 AC_PROG_LIBTOOL |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
646 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
647 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
648 |
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
649 |
# ----------------------------------------------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
650 |
# If this macro is not defined by Autoconf, define it here. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
651 |
m4_ifdef([AC_PROVIDE_IFELSE], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
652 |
[], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
653 |
[m4_define([AC_PROVIDE_IFELSE], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
654 |
@@ -101,17 +101,16 @@ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
655 |
AC_REQUIRE([AC_PROG_NM])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
656 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
657 |
AC_REQUIRE([AC_PROG_LN_S])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
658 |
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
659 |
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
660 |
AC_REQUIRE([AC_OBJEXT])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
661 |
AC_REQUIRE([AC_EXEEXT])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
662 |
dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
663 |
- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
664 |
AC_LIBTOOL_SYS_MAX_CMD_LEN |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
665 |
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
666 |
AC_LIBTOOL_OBJDIR |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
667 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
668 |
AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
669 |
_LT_AC_PROG_ECHO_BACKSLASH |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
670 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
671 |
case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
672 |
@@ -176,17 +175,17 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
673 |
test -z "$NM" && NM=nm |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
674 |
test -z "$SED" && SED=sed |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
675 |
test -z "$OBJDUMP" && OBJDUMP=objdump |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
676 |
test -z "$RANLIB" && RANLIB=: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
677 |
test -z "$STRIP" && STRIP=: |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
678 |
test -z "$ac_objext" && ac_objext=o |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
679 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
680 |
# Determine commands to create old-style static archives. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
681 |
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
682 |
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
683 |
old_postinstall_cmds='chmod 644 $oldlib' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
684 |
old_postuninstall_cmds= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
685 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
686 |
if test -n "$RANLIB"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
687 |
case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
688 |
openbsd*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
689 |
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
690 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
691 |
@@ -203,16 +202,18 @@ _LT_CC_BASENAME([$compiler]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
692 |
case $deplibs_check_method in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
693 |
file_magic*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
694 |
if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
695 |
AC_PATH_MAGIC |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
696 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
697 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
698 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
699 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
700 |
+_LT_REQUIRED_DARWIN_CHECKS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
701 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
702 |
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
703 |
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
704 |
enable_win32_dll=yes, enable_win32_dll=no) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
705 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
706 |
AC_ARG_ENABLE([libtool-lock], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
707 |
[AC_HELP_STRING([--disable-libtool-lock], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
708 |
[avoid locking (might break parallel builds)])]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
709 |
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
710 |
@@ -263,52 +264,133 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
711 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
712 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
713 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
714 |
# _LT_COMPILER_BOILERPLATE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
715 |
# ------------------------ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
716 |
# Check for compiler boilerplate output or warnings with |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
717 |
# the simple compiler test code. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
718 |
AC_DEFUN([_LT_COMPILER_BOILERPLATE], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
719 |
-[ac_outfile=conftest.$ac_objext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
720 |
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
721 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
722 |
+ac_outfile=conftest.$ac_objext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
723 |
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
724 |
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
725 |
_lt_compiler_boilerplate=`cat conftest.err` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
726 |
$rm conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
727 |
])# _LT_COMPILER_BOILERPLATE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
728 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
729 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
730 |
# _LT_LINKER_BOILERPLATE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
731 |
# ---------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
732 |
# Check for linker boilerplate output or warnings with |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
733 |
# the simple link test code. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
734 |
AC_DEFUN([_LT_LINKER_BOILERPLATE], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
735 |
-[ac_outfile=conftest.$ac_objext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
736 |
-printf "$lt_simple_link_test_code" >conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
737 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
738 |
+ac_outfile=conftest.$ac_objext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
739 |
+echo "$lt_simple_link_test_code" >conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
740 |
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
741 |
_lt_linker_boilerplate=`cat conftest.err` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
742 |
-$rm conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
743 |
+$rm -r conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
744 |
])# _LT_LINKER_BOILERPLATE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
745 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
746 |
+# _LT_REQUIRED_DARWIN_CHECKS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
747 |
+# -------------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
748 |
+# Check for some things on darwin |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
749 |
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
750 |
+ case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
751 |
+ rhapsody* | darwin*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
752 |
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
753 |
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
754 |
+ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
755 |
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
756 |
+ [lt_cv_apple_cc_single_mod=no |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
757 |
+ if test -z "${LT_MULTI_MODULE}"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
758 |
+ # By default we will add the -single_module flag. You can override |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
759 |
+ # by either setting the environment variable LT_MULTI_MODULE |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
760 |
+ # non-empty at configure time, or by adding -multi_module to the |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
761 |
+ # link flags. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
762 |
+ echo "int foo(void){return 1;}" > conftest.c |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
763 |
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
764 |
+ -dynamiclib ${wl}-single_module conftest.c |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
765 |
+ if test -f libconftest.dylib; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
766 |
+ lt_cv_apple_cc_single_mod=yes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
767 |
+ rm -rf libconftest.dylib* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
768 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
769 |
+ rm conftest.c |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
770 |
+ fi]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
771 |
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
772 |
+ [lt_cv_ld_exported_symbols_list], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
773 |
+ [lt_cv_ld_exported_symbols_list=no |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
774 |
+ save_LDFLAGS=$LDFLAGS |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
775 |
+ echo "_main" > conftest.sym |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
776 |
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
777 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
778 |
+ [lt_cv_ld_exported_symbols_list=yes], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
779 |
+ [lt_cv_ld_exported_symbols_list=no]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
780 |
+ LDFLAGS="$save_LDFLAGS" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
781 |
+ ]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
782 |
+ case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
783 |
+ rhapsody* | darwin1.[[0123]]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
784 |
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
785 |
+ darwin1.*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
786 |
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
787 |
+ darwin*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
788 |
+ # if running on 10.5 or later, the deployment target defaults |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
789 |
+ # to the OS version, if on x86, and 10.4, the deployment |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
790 |
+ # target defaults to 10.4. Don't you love it? |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
791 |
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
792 |
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
793 |
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
794 |
+ 10.[[012]]*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
795 |
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
796 |
+ 10.*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
797 |
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
798 |
+ esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
799 |
+ ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
800 |
+ esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
801 |
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
802 |
+ _lt_dar_single_mod='$single_module' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
803 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
804 |
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
805 |
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
806 |
+ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
807 |
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
808 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
809 |
+ if test "$DSYMUTIL" != ":"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
810 |
+ _lt_dsymutil="~$DSYMUTIL \$lib || :" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
811 |
+ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
812 |
+ _lt_dsymutil= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
813 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
814 |
+ ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
815 |
+ esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
816 |
+]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
817 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
818 |
# _LT_AC_SYS_LIBPATH_AIX |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
819 |
# ---------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
820 |
# Links a minimal program and checks the executable |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
821 |
# for the system default hardcoded library path. In most cases, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
822 |
# this is /usr/lib:/lib, but when the MPI compilers are used |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
823 |
# the location of the communication and MPI libs are included too. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
824 |
# If we don't find anything, use the default library path according |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
825 |
# to the aix ld manual. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
826 |
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
827 |
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
828 |
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
829 |
-}'` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
830 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
831 |
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
832 |
+lt_aix_libpath_sed=' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
833 |
+ /Import File Strings/,/^$/ { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
834 |
+ /^0/ { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
835 |
+ s/^0 *\(.*\)$/\1/ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
836 |
+ p |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
837 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
838 |
+ }' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
839 |
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
840 |
# Check for a 64-bit object if we didn't find anything. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
841 |
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
842 |
-}'`; fi],[]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
843 |
+if test -z "$aix_libpath"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
844 |
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
845 |
+fi],[]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
846 |
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
847 |
])# _LT_AC_SYS_LIBPATH_AIX |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
848 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
849 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
850 |
# _LT_AC_SHELL_INIT(ARG) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
851 |
# ---------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
852 |
AC_DEFUN([_LT_AC_SHELL_INIT], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
853 |
[ifdef([AC_DIVERSION_NOTICE], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
854 |
@@ -529,39 +611,46 @@ ia64-*-hpux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
855 |
LD="${LD-ld} -64" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
856 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
857 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
858 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
859 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
860 |
rm -rf conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
861 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
862 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
863 |
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
864 |
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
865 |
+s390*-*linux*|sparc*-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
866 |
# Find out which ABI we are using. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
867 |
echo 'int i;' > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
868 |
if AC_TRY_EVAL(ac_compile); then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
869 |
case `/usr/bin/file conftest.o` in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
870 |
*32-bit*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
871 |
case $host in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
872 |
+ x86_64-*kfreebsd*-gnu) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
873 |
+ LD="${LD-ld} -m elf_i386_fbsd" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
874 |
+ ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
875 |
x86_64-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
876 |
LD="${LD-ld} -m elf_i386" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
877 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
878 |
ppc64-*linux*|powerpc64-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
879 |
LD="${LD-ld} -m elf32ppclinux" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
880 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
881 |
s390x-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
882 |
LD="${LD-ld} -m elf_s390" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
883 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
884 |
sparc64-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
885 |
LD="${LD-ld} -m elf32_sparc" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
886 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
887 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
888 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
889 |
*64-bit*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
890 |
case $host in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
891 |
+ x86_64-*kfreebsd*-gnu) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
892 |
+ LD="${LD-ld} -m elf_x86_64_fbsd" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
893 |
+ ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
894 |
x86_64-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
895 |
LD="${LD-ld} -m elf_x86_64" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
896 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
897 |
ppc*-*linux*|powerpc*-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
898 |
LD="${LD-ld} -m elf64ppc" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
899 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
900 |
s390*-*linux*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
901 |
LD="${LD-ld} -m elf64_s390" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
902 |
@@ -592,17 +681,21 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
903 |
sparc*-*solaris*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
904 |
# Find out which ABI we are using. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
905 |
echo 'int i;' > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
906 |
if AC_TRY_EVAL(ac_compile); then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
907 |
case `/usr/bin/file conftest.o` in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
908 |
*64-bit*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
909 |
case $lt_cv_prog_gnu_ld in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
910 |
yes*) LD="${LD-ld} -m elf64_sparc" ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
911 |
- *) LD="${LD-ld} -64" ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
912 |
+ *) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
913 |
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
914 |
+ LD="${LD-ld} -64" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
915 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
916 |
+ ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
917 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
918 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
919 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
920 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
921 |
rm -rf conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
922 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
923 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
924 |
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
925 |
@@ -623,17 +716,17 @@ need_locks="$enable_libtool_lock" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
926 |
# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
927 |
# ---------------------------------------------------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
928 |
# Check whether the given compiler option works |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
929 |
AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
930 |
[AC_REQUIRE([LT_AC_PROG_SED]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
931 |
AC_CACHE_CHECK([$1], [$2], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
932 |
[$2=no |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
933 |
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
934 |
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
935 |
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
936 |
lt_compiler_flag="$3" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
937 |
# Insert the option either (1) after the last *FLAGS variable, or |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
938 |
# (2) before a word containing "conftest.", or (3) at the end. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
939 |
# Note that $ac_compile itself does not contain backslashes and begins |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
940 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
941 |
# The option is referenced via a variable to avoid confusing sed. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
942 |
lt_compile=`echo "$ac_compile" | $SED \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
943 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
944 |
@@ -664,37 +757,38 @@ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
945 |
])# AC_LIBTOOL_COMPILER_OPTION |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
946 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
947 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
948 |
# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
949 |
# [ACTION-SUCCESS], [ACTION-FAILURE]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
950 |
# ------------------------------------------------------------ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
951 |
# Check whether the given compiler option works |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
952 |
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
953 |
-[AC_CACHE_CHECK([$1], [$2], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
954 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
955 |
+AC_CACHE_CHECK([$1], [$2], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
956 |
[$2=no |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
957 |
save_LDFLAGS="$LDFLAGS" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
958 |
LDFLAGS="$LDFLAGS $3" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
959 |
- printf "$lt_simple_link_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
960 |
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
961 |
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
962 |
# The linker can only warn and ignore the option if not recognized |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
963 |
# So say no if there are warnings |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
964 |
if test -s conftest.err; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
965 |
# Append any errors to the config.log. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
966 |
cat conftest.err 1>&AS_MESSAGE_LOG_FD |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
967 |
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
968 |
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
969 |
if diff conftest.exp conftest.er2 >/dev/null; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
970 |
$2=yes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
971 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
972 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
973 |
$2=yes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
974 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
975 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
976 |
- $rm conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
977 |
+ $rm -r conftest* |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
978 |
LDFLAGS="$save_LDFLAGS" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
979 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
980 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
981 |
if test x"[$]$2" = xyes; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
982 |
ifelse([$4], , :, [$4]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
983 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
984 |
ifelse([$5], , :, [$5]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
985 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
986 |
@@ -782,34 +876,37 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
987 |
kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
988 |
if test -n "$kargmax"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
989 |
lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
990 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
991 |
lt_cv_sys_max_cmd_len=32768 |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
992 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
993 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
994 |
*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
995 |
- # If test is not a shell built-in, we'll probably end up computing a |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
996 |
- # maximum length that is only half of the actual maximum length, but |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
997 |
- # we can't tell. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
998 |
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
999 |
- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1000 |
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1001 |
+ if test -n "$lt_cv_sys_max_cmd_len"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1002 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1003 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1004 |
+ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1005 |
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1006 |
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1007 |
= "XX$teststring") >/dev/null 2>&1 && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1008 |
- new_result=`expr "X$teststring" : ".*" 2>&1` && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1009 |
- lt_cv_sys_max_cmd_len=$new_result && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1010 |
- test $i != 17 # 1/2 MB should be enough |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1011 |
- do |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1012 |
- i=`expr $i + 1` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1013 |
- teststring=$teststring$teststring |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1014 |
- done |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1015 |
- teststring= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1016 |
- # Add a significant safety factor because C++ compilers can tack on massive |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1017 |
- # amounts of additional arguments before passing them to the linker. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1018 |
- # It appears as though 1/2 is a usable value. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1019 |
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1020 |
+ new_result=`expr "X$teststring" : ".*" 2>&1` && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1021 |
+ lt_cv_sys_max_cmd_len=$new_result && |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1022 |
+ test $i != 17 # 1/2 MB should be enough |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1023 |
+ do |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1024 |
+ i=`expr $i + 1` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1025 |
+ teststring=$teststring$teststring |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1026 |
+ done |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1027 |
+ teststring= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1028 |
+ # Add a significant safety factor because C++ compilers can tack on massive |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1029 |
+ # amounts of additional arguments before passing them to the linker. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1030 |
+ # It appears as though 1/2 is a usable value. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1031 |
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1032 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1033 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1034 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1035 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1036 |
if test -n $lt_cv_sys_max_cmd_len ; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1037 |
AC_MSG_RESULT($lt_cv_sys_max_cmd_len) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1038 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1039 |
AC_MSG_RESULT(none) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1040 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1041 |
@@ -952,25 +1049,25 @@ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1042 |
lt_cv_dlopen_self=yes |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1043 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1044 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1045 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1046 |
*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1047 |
AC_CHECK_FUNC([shl_load], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1048 |
[lt_cv_dlopen="shl_load"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1049 |
[AC_CHECK_LIB([dld], [shl_load], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1050 |
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1051 |
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1052 |
[AC_CHECK_FUNC([dlopen], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1053 |
[lt_cv_dlopen="dlopen"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1054 |
[AC_CHECK_LIB([dl], [dlopen], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1055 |
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1056 |
[AC_CHECK_LIB([svld], [dlopen], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1057 |
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1058 |
[AC_CHECK_LIB([dld], [dld_link], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1059 |
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1060 |
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1061 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1062 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1063 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1064 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1065 |
]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1066 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1067 |
esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1068 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1069 |
@@ -1026,25 +1123,26 @@ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1070 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1071 |
])# AC_LIBTOOL_DLOPEN_SELF |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1072 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1073 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1074 |
# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1075 |
# --------------------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1076 |
# Check to see if options -c and -o are simultaneously supported by compiler |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1077 |
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1078 |
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1079 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1080 |
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1081 |
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1082 |
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1083 |
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1084 |
$rm -r conftest 2>/dev/null |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1085 |
mkdir conftest |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1086 |
cd conftest |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1087 |
mkdir out |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1088 |
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1089 |
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1090 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1091 |
lt_compiler_flag="-o out/conftest2.$ac_objext" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1092 |
# Insert the option either (1) after the last *FLAGS variable, or |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1093 |
# (2) before a word containing "conftest.", or (3) at the end. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1094 |
# Note that $ac_compile itself does not contain backslashes and begins |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1095 |
# with a dollar sign (not a hyphen), so the echo should work correctly. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1096 |
lt_compile=`echo "$ac_compile" | $SED \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1097 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1098 |
@@ -1174,16 +1272,17 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1099 |
test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1100 |
AC_MSG_RESULT([yes]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1101 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1102 |
# FIXME - insert some real tests, host_os isn't really good enough |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1103 |
case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1104 |
darwin*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1105 |
if test -n "$STRIP" ; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1106 |
striplib="$STRIP -x" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1107 |
+ old_striplib="$STRIP -S" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1108 |
AC_MSG_RESULT([yes]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1109 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1110 |
AC_MSG_RESULT([no]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1111 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1112 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1113 |
*) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1114 |
AC_MSG_RESULT([no]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1115 |
;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1116 |
@@ -1191,44 +1290,83 @@ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1117 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1118 |
])# AC_LIBTOOL_SYS_LIB_STRIP |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1119 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1120 |
|
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1121 |
# AC_LIBTOOL_SYS_DYNAMIC_LINKER |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1122 |
# ----------------------------- |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1123 |
# PORTME Fill in your ld.so characteristics |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1124 |
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1125 |
-[AC_MSG_CHECKING([dynamic linker characteristics]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1126 |
+[AC_REQUIRE([LT_AC_PROG_SED])dnl |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1127 |
+AC_MSG_CHECKING([dynamic linker characteristics]) |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1128 |
library_names_spec= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1129 |
libname_spec='lib$name' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1130 |
soname_spec= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1131 |
shrext_cmds=".so" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1132 |
postinstall_cmds= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1133 |
postuninstall_cmds= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1134 |
finish_cmds= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1135 |
finish_eval= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1136 |
shlibpath_var= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1137 |
shlibpath_overrides_runpath=unknown |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1138 |
version_type=none |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1139 |
dynamic_linker="$host_os ld.so" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1140 |
sys_lib_dlsearch_path_spec="/lib /usr/lib" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1141 |
+m4_if($1,[],[ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1142 |
if test "$GCC" = yes; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1143 |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1144 |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1145 |
+ case $host_os in |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1146 |
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1147 |
+ *) lt_awk_arg="/^libraries:/" ;; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1148 |
+ esac |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1149 |
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1150 |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1151 |
# if the path contains ";" then we assume it to be the separator |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1152 |
# otherwise default to the standard path separator (i.e. ":") - it is |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1153 |
# assumed that no part of a normal pathname contains ";" but that should |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1154 |
# okay in the real world where ";" in dirpaths is itself problematic. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1155 |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1156 |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1157 |
else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1158 |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1159 |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1160 |
fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1161 |
+ # Ok, now we have the path, separated by spaces, we can step through it |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1162 |
+ # and add multilib dir if necessary. |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1163 |
+ lt_tmp_lt_search_path_spec= |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1164 |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1165 |
+ for lt_sys_path in $lt_search_path_spec; do |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1166 |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1167 |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1168 |
+ else |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1169 |
+ test -d "$lt_sys_path" && \ |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1170 |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1171 |
+ fi |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1172 |
+ done |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1173 |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1174 |
+BEGIN {RS=" "; FS="/|\n";} { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1175 |
+ lt_foo=""; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1176 |
+ lt_count=0; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1177 |
+ for (lt_i = NF; lt_i > 0; lt_i--) { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1178 |
+ if ($lt_i != "" && $lt_i != ".") { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1179 |
+ if ($lt_i == "..") { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1180 |
+ lt_count++; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1181 |
+ } else { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1182 |
+ if (lt_count == 0) { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1183 |
+ lt_foo="/" $lt_i lt_foo; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1184 |
+ } else { |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1185 |
+ lt_count--; |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1186 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1187 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1188 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1189 |
+ } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1190 |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1191 |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
3a1561dda105
Patch mozilla-central breakpad code into 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1192 |
+}'` |