From patchwork Wed Nov 28 09:16:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] libcacard: use LDFLAGS to produce i686 with --cpu=i386 Date: Tue, 27 Nov 2012 23:16:25 -0000 From: Alon Levy X-Patchwork-Id: 202398 Message-Id: <1354094186-32203-1-git-send-email-alevy@redhat.com> To: qemu-devel@nongnu.org Signed-off-by: Alon Levy --- libcacard/Makefile | 4 ++-- roms/openbios | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index c26aac6..25bc4a0 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -15,7 +15,7 @@ QEMU_CFLAGS+=-I../ libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o - $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") + $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LDFLAGS) $(LIBS)," LINK $@") clean: rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc @@ -36,7 +36,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 diff --git a/roms/openbios b/roms/openbios index f095c85..d1d2787 160000 --- a/roms/openbios +++ b/roms/openbios @@ -1 +1 @@ -Subproject commit f095c858136896d236931357b8d597f407286f71 +Subproject commit d1d2787f87167edf487a60e61b9168514d5a7434