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

Fix the win32 build 

I managed to break this when refactoring things.
This commit is contained in:
Palmer Dabbelt 2017-06-19 11:30:01 -07:00
parent 8825305ca9
commit b478e48a20
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -28,6 +28,7 @@ AUTORECONF ?= autoreconf
OBJ_NATIVE := $(OBJDIR)/$(NATIVE) OBJ_NATIVE := $(OBJDIR)/$(NATIVE)
OBJ_UBUNTU := $(OBJDIR)/$(UBUNTU) OBJ_UBUNTU := $(OBJDIR)/$(UBUNTU)
OBJ_WIN32 := $(OBJDIR)/$(WIN32)
OBJ_WIN64 := $(OBJDIR)/$(WIN64) OBJ_WIN64 := $(OBJDIR)/$(WIN64)
SRC_RGT := $(SRCDIR)/riscv-gnu-toolchain SRC_RGT := $(SRCDIR)/riscv-gnu-toolchain
@ -51,9 +52,9 @@ win64-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN64).tar.gz
win64-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN64).src.tar.gz win64-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN64).src.tar.gz
.PHONY: win32 win32-openocd win32-gcc .PHONY: win32 win32-openocd win32-gcc
win32: win32-openocd win32-gcc win32: win32-openocd win32-gcc
win32-gcc: $(BINDIR)/riscv32-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).zip win32-gcc: $(BINDIR)/riscv64-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).zip
win32-gcc: $(BINDIR)/riscv32-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).tar.gz win32-gcc: $(BINDIR)/riscv64-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).tar.gz
win32-gcc: $(BINDIR)/riscv32-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).src.tar.gz win32-gcc: $(BINDIR)/riscv64-unknown-elf-gcc-$(RGT_VERSION)-$(WIN32).src.tar.gz
win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).zip win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).zip
win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).tar.gz win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).tar.gz
win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).src.tar.gz win32-openocd: $(BINDIR)/riscv-openocd-$(ROCD_VERSION)-$(WIN32).src.tar.gz
@ -128,6 +129,9 @@ $(OBJDIR)/%/build/riscv-gnu-toolchain/stamp:
$(OBJ_WIN64)/stamps/riscv-gnu-toolchain/install.stamp: \ $(OBJ_WIN64)/stamps/riscv-gnu-toolchain/install.stamp: \
$(OBJ_NATIVE)/stamps/riscv-gnu-toolchain/install.stamp $(OBJ_NATIVE)/stamps/riscv-gnu-toolchain/install.stamp
$(OBJ_WIN32)/stamps/riscv-gnu-toolchain/install.stamp: \
$(OBJ_NATIVE)/stamps/riscv-gnu-toolchain/install.stamp
# OpenOCD requires a GDB that's been build with expat support so it can read # OpenOCD requires a GDB that's been build with expat support so it can read
# the target XML files. # the target XML files.
$(OBJDIR)/%/stamps/expat/install.stamp: \ $(OBJDIR)/%/stamps/expat/install.stamp: \
@ -192,13 +196,25 @@ $(OBJDIR)/%/build/riscv-openocd/configure:
# We might need some extra target libraries for OpenOCD # We might need some extra target libraries for OpenOCD
$(OBJDIR)/%/stamps/riscv-openocd/libs.stamp: \ $(OBJDIR)/%/stamps/riscv-openocd/libs.stamp: \
$(OBJDIR)/%/stamps/riscv-openocd/install.stamp $(OBJDIR)/%/stamps/riscv-openocd/install.stamp
date > $@
$(OBJ_WIN64)/stamps/riscv-openocd/libs.stamp: \
$(OBJ_WIN64)/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 $(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 > $@ date > $@
$(OBJ_WIN32)/stamps/riscv-openocd/libs.stamp: \
$(OBJ_WIN32)/stamps/riscv-openocd/install.stamp
$(WIN32)-gcc -print-search-dirs | grep ^libraries | cut -d= -f2- | xargs -I {} -d: find {} -iname "libgcc_*.dll" | xargs cp -t $(OBJDIR)/$(WIN32)/install/riscv-openocd-$(ROCD_VERSION)-$(WIN32)/bin
date > $@
# Use the host libusb unless we expect there to be none # Use the host libusb unless we expect there to be none
$(OBJ_WIN64)/stamps/riscv-openocd/install.stamp: \ $(OBJ_WIN64)/stamps/riscv-openocd/install.stamp: \
$(OBJ_WIN64)/stamps/libusb/install.stamp $(OBJ_WIN64)/stamps/libusb/install.stamp
$(OBJ_WIN32)/stamps/riscv-openocd/install.stamp: \
$(OBJ_WIN32)/stamps/libusb/install.stamp
# OpenOCD needs libusb # OpenOCD needs libusb
$(OBJDIR)/%/stamps/libusb/install.stamp: \ $(OBJDIR)/%/stamps/libusb/install.stamp: \
$(OBJDIR)/%/build/libusb/configure $(OBJDIR)/%/build/libusb/configure