Skip to content

Fix autotools install by renaming MinGW dump_syms #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slipher wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix autotools install by renaming MinGW dump_syms #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ lib*.a
/src/tools/linux/symupload/sym_upload
/src/tools/mac/dump_syms/dump_syms
/src/tools/mac/dump_syms/dump_syms_mac
/src/tools/windows/dump_syms_dwarf/dump_syms
/src/tools/windows/dump_syms_dwarf/dump_syms_dwarf

# Ignore unit test artifacts.
*_unittest
Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ endif LINUX_HOST

if !DISABLE_TOOLS
bin_PROGRAMS += \
src/tools/windows/dump_syms_dwarf/dump_syms
src/tools/windows/dump_syms_dwarf/dump_syms_dwarf
endif

if MINGW_HOST
Expand Down Expand Up @@ -839,7 +839,7 @@ src_tools_linux_md2core_minidump_2_core_unittest_LDADD = \
endif LINUX_HOST

if !DISABLE_TOOLS
src_tools_windows_dump_syms_dwarf_dump_syms_SOURCES = \
src_tools_windows_dump_syms_dwarf_dump_syms_dwarf_SOURCES = \
src/common/dwarf_cfi_to_module.cc \
src/common/dwarf_cu_to_module.cc \
src/common/dwarf_line_to_module.cc \
Expand All @@ -853,7 +853,7 @@ src_tools_windows_dump_syms_dwarf_dump_syms_SOURCES = \
src/common/pecoff/pecoffutils.cc \
src/common/pecoff/pecoff_file_id.cc \
src/tools/windows/dump_syms_dwarf/dump_syms.cc
src_tools_windows_dump_syms_dwarf_dump_syms_LDADD = \
src_tools_windows_dump_syms_dwarf_dump_syms_dwarf_LDADD = \
$(SOCKET_LIBS)
endif

Expand Down
3 changes: 2 additions & 1 deletion symbolize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import subprocess


# Assumes in-source build. TODO: make it work with install?
def dump_syms_path(bin):
if bin.endswith(".exe"): # Windows target
ds_path = "src/tools/windows/dump_syms_dwarf/dump_syms"
ds_path = "src/tools/windows/dump_syms_dwarf/dump_syms_dwarf"
else: # Linux or NaCl target
ds_path = "src/tools/linux/dump_syms/dump_syms"
return os.path.join(os.path.dirname(__file__), ds_path)
Expand Down