Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts

This commit is contained in:
Cen Zhang 2019-07-29 17:37:41 +08:00 committed by naq
parent eb357143a2
commit 68ebda0af8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -479,7 +479,7 @@ clean:
rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).pc rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).pc
rm -f $(PKGCFGF) rm -f $(PKGCFGF)
rm -f $(AUTODEPS) rm -f $(AUTODEPS)
[ ${ANDROID} -eq 1 ] && rm -rf android-ndk-* [ "${ANDROID}" = "1" ] && rm -rf android-ndk-* || true
$(MAKE) -C cstool clean $(MAKE) -C cstool clean
ifeq (,$(findstring yes,$(CAPSTONE_BUILD_CORE_ONLY))) ifeq (,$(findstring yes,$(CAPSTONE_BUILD_CORE_ONLY)))