From patchwork Wed Nov 28 09:16:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 202398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E1A782C0091 for ; Wed, 28 Nov 2012 20:16:45 +1100 (EST) Received: from localhost ([::1]:43581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tddl5-0002dJ-Sl for incoming@patchwork.ozlabs.org; Wed, 28 Nov 2012 04:16:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tddkt-0002ck-2N for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:16:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tddkr-0003eC-8I for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:16:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tddkr-0003e6-0W for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:16:29 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAS9GSBO028754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Nov 2012 04:16:28 -0500 Received: from garlic.redhat.com (vpn1-4-144.ams2.redhat.com [10.36.4.144]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAS9GQwe004613 for ; Wed, 28 Nov 2012 04:16:27 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 28 Nov 2012 11:16:25 +0200 Message-Id: <1354094186-32203-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] libcacard: use LDFLAGS to produce i686 with --cpu=i386 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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