41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From d227beb4202b6907e4d6eba1d1e6e99ef772587e Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Mon, 26 Nov 2012 14:54:09 +0200
|
|
Subject: [PATCH] libcacard: use LDFLAGS to produce i686 with --cpu=i386
|
|
|
|
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
---
|
|
Makefile | 2 +-
|
|
libcacard/Makefile | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index dd11e3c..2bed319 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -169,7 +169,7 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
|
|
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
|
|
|
|
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) $(tools-obj-y) qemu-timer-common.o libcacard/vscclient.o
|
|
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@")
|
|
+ $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LDFLAGS) $(LIBS)," LINK $@")
|
|
|
|
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
|
|
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
|
diff --git a/libcacard/Makefile b/libcacard/Makefile
|
|
index faca3ca..ce9a921 100644
|
|
--- a/libcacard/Makefile
|
|
+++ b/libcacard/Makefile
|
|
@@ -37,7 +37,7 @@ install-libcacard:
|
|
@echo "libtool is missing, please install and rerun configure"; exit 1
|
|
else
|
|
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
|
|
- $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@")
|
|
+ $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@")
|
|
|
|
libcacard_srcpath=$(SRC_PATH)/libcacard
|
|
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in
|
|
--
|
|
1.8.0
|
|
|