interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install libgcc*.dll along with OpenOCD 

Since users might not have MinGW installed on their target machines we
want to bundle all the necessary DLLs along with OpenOCD.  This does so.
This commit is contained in:
Palmer Dabbelt 2017-06-07 18:20:50 -07:00
parent 08fc145225
commit f0d7137480
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -131,7 +131,8 @@ $(OBJDIR)/%/build/expat/configure:
# The OpenOCD builds go here
$(BINDIR)/riscv-openocd-$(ROCD_VERSION)-%.zip: \
$(OBJDIR)/%/stamps/riscv-openocd/install.stamp
$(OBJDIR)/%/stamps/riscv-openocd/install.stamp \
$(OBJDIR)/%/stamps/riscv-openocd/libs.stamp
$(eval $@_TARGET := $(patsubst $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-%.zip,%,$@))
mkdir -p $(dir $@)
cd $(OBJDIR)/$($@_TARGET)/install; zip -r $(abspath $@) riscv-openocd-$(ROCD_VERSION)-$($@_TARGET)
@ -168,6 +169,12 @@ $(OBJDIR)/%/build/riscv-openocd/configure:
cd $(dir $@); autoreconf -i
touch -c $@
# We might need some extra target libraries for OpenOCD
$(OBJDIR)/%/stamps/riscv-openocd/libs.stamp: \
$(OBJDIR)/%/stamps/riscv-openocd/install.stamp
$(WIN64)-gcc -print-search-dirs | grep ^libraries | cut -d= -f2- | xargs -I {} -d: find {} -iname "libgcc_*.dll" | xargs cp -t $(OBJDIR)/$(WIN64)/install/riscv-openocd-$(ROCD_VERSION)-$(WIN64)/bin
date > $@
# Use the host libusb unless we expect there to be none
$(OBJ_WIN64)/stamps/riscv-openocd/install.stamp: \
$(OBJ_WIN64)/stamps/libusb/install.stamp