mirror of
https://github.com/capstone-engine/capstone.git
synced 2025-03-09 01:13:45 +00:00
resolve merge conflicts
This commit is contained in:
parent
b78a640364
commit
e5f0539626
2
Makefile
2
Makefile
@ -479,7 +479,7 @@ clean:
|
||||
rm -f $(BLDIR)/lib$(LIBNAME).* $(BLDIR)/$(LIBNAME).pc
|
||||
rm -f $(PKGCFGF)
|
||||
rm -f $(AUTODEPS)
|
||||
[ ${ANDROID} -eq 1 ] && rm -rf android-ndk-*
|
||||
[ "${ANDROID}" = "1" ] && rm -rf android-ndk-* || true
|
||||
$(MAKE) -C cstool clean
|
||||
|
||||
ifeq (,$(findstring yes,$(CAPSTONE_BUILD_CORE_ONLY)))
|
||||
|
Loading…
x
Reference in New Issue
Block a user