aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e>2009-06-05 23:06:54 +0000
committernealsid <nealsid@4c0a9323-5329-0410-9bdc-e9ce6186880e>2009-06-05 23:06:54 +0000
commitdae47f0d169973baa4d4cfe2f3b115ebea8b803f (patch)
treea6c1335efb64f76550c6508dbea55b9ded2056af
parentUse ctsdio streams for dump_syms for significant speedup. Also contains a ma... (diff)
downloadbreakpad-dae47f0d169973baa4d4cfe2f3b115ebea8b803f.tar.xz
Support overriding makefile variables, changed defaults compilation flags. This patch from Jim Blandy was Merged with a previous change from nealsid to force 32-bit compilation even on 64-bit machines.
A=jim blandy R=nealsid git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@348 4c0a9323-5329-0410-9bdc-e9ce6186880e
-rw-r--r--src/tools/linux/dump_syms/Makefile19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/tools/linux/dump_syms/Makefile b/src/tools/linux/dump_syms/Makefile
index ce60a42b..21d848d7 100644
--- a/src/tools/linux/dump_syms/Makefile
+++ b/src/tools/linux/dump_syms/Makefile
@@ -1,7 +1,14 @@
CXX=g++
CC=gcc
-CXXFLAGS=-gstabs -I../../.. -DNDEBUG -Wall -D_REENTRANT -m32
+CPPFLAGS=-DNDEBUG
+CXXFLAGS=-g3 -O2 -Wall -m32
+
+
+# These flags are necessary to compile correctly; the 'override'
+# command makes sure these are added even if the user sets CPPFLAGS on
+# the command line.
+override CPPFLAGS+=-I../../.. -D_REENTRANT
.PHONY:all clean
@@ -12,19 +19,19 @@ all:$(BIN)
DUMP_OBJ=dump_symbols.o guid_creator.o dump_syms.o file_id.o md5.o
dump_syms:$(DUMP_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $^
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^
dump_symbols.o:../../../common/linux/dump_symbols.cc
- $(CXX) $(CXXFLAGS) -c $^
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
guid_creator.o:../../../common/linux/guid_creator.cc
- $(CXX) $(CXXFLAGS) -c $^
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
file_id.o:../../../common/linux/file_id.cc
- $(CXX) $(CXXFLAGS) -c $^
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
md5.o:../../../common/md5.c
- $(CC) $(CXXFLAGS) -c $^
+ $(CC) $(CPPFLAGS) $(CXXFLAGS) -c $^
clean:
rm -f $(BIN) $(DUMP_OBJ)