summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Hajnoczi2011-08-25 10:18:52 +0200
committerAnthony Liguori2011-09-01 20:12:51 +0200
commite2a99ad3e174ab4c9d2320dcecd779230409829f (patch)
tree4f58a2193d330d159410d20d5c04587430b3accc
parentmain: switch qemu_set_fd_handler to g_io_add_watch (diff)
downloadqemu-e2a99ad3e174ab4c9d2320dcecd779230409829f.tar.gz
qemu-e2a99ad3e174ab4c9d2320dcecd779230409829f.tar.xz
qemu-e2a99ad3e174ab4c9d2320dcecd779230409829f.zip
build: sort objects to remove duplicates for link
Avoid duplicate object files during the link. There are legitimate cases where a link command-line would include duplicate object files because two independent subsystems both depend on common infrastructure. Use GNU make's $(sort) function to remove duplicate object files from the link command-line. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--rules.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules.mak b/rules.mak
index 884d421ae4..04a91983ec 100644
--- a/rules.mak
+++ b/rules.mak
@@ -31,7 +31,7 @@ endif
%.o: %.m
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
-LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@")
+LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(sort $(1)) $(LIBS)," LINK $(TARGET_DIR)$@")
%$(EXESUF): %.o
$(call LINK,$^)