Commit fba90ac1 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

win32: fix compilation again 



While commit c02817e5 fixed compilation
without an installed libtool, moving the dependencies to rules.mak does
not work because the version-*-y variables are not defined yet.  Building
in a clean tree thus fails.

Revert the commit and remove the dummy /bin/false assignment to LIBTOOL.
This makes the build work, at the price of slightly worse errors when
there are Makefile bugs.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1367425815-15083-1-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent cc9936a3

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ version.lo: $(SRC_PATH)/version.rc config-host.h 
version-obj-$(CONFIG_WIN32) += version.o

version-lobj-$(CONFIG_WIN32) += version.lo



Makefile: $(version-obj-y) $(version-lobj-y)



######################################################################

# Build libraries

rules.mak

+1 −5
Original line number Diff line number Diff line
@@ -22,15 +22,11 @@ QEMU_INCLUDES += -I$(<D) -I$(@D) 
%.o: %.rc

	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")



Makefile: $(version-obj-y)



ifeq ($(LIBTOOL),)

LIBTOOL = /bin/false

LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \

       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \

       $(LIBS),"  LINK  $(TARGET_DIR)$@")

else

Makefile: $(version-lobj-y)

LIBTOOL += $(if $(V),,--quiet)

%.lo: %.c

	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  lt CC $@")
@@ -74,7 +70,7 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) 
cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \

              >/dev/null 2>&1 && echo OK), $2, $3)



VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.texi %.sh

VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.texi %.sh %.rc

set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1)))



# find-in-path