Merge branch 'master' into noglib

This commit is contained in:
Nguyen Anh Quynh
2016-12-26 13:46:38 +08:00
2 changed files with 4 additions and 3 deletions

View File

@@ -207,7 +207,7 @@ qemu/config-host.h-timestamp:
unicorn: $(LIBRARY) $(ARCHIVE)
$(LIBRARY): qemu/config-host.h-timestamp uc.o list.o
$(LIBRARY): qemu/config-host.h-timestamp
ifeq ($(UNICORN_SHARED),yes)
ifeq ($(V),0)
$(call log,GEN,$(LIBRARY))
@@ -219,7 +219,7 @@ else
endif
endif
$(ARCHIVE): qemu/config-host.h-timestamp uc.o list.o
$(ARCHIVE): qemu/config-host.h-timestamp
ifeq ($(UNICORN_STATIC),yes)
ifeq ($(V),0)
$(call log,GEN,$(ARCHIVE))