Patchwork [1/2] libcacard: use LDFLAGS to produce i686 with --cpu=i386

login
register
mail settings
Submitter Alon Levy
Date Nov. 28, 2012, 9:16 a.m.
Message ID <1354094186-32203-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/202398/
State New
Headers show

Comments

Alon Levy - Nov. 28, 2012, 9:16 a.m.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
 libcacard/Makefile | 4 ++--
 roms/openbios      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Paolo Bonzini - Nov. 28, 2012, 9:36 a.m.
Il 28/11/2012 10:16, Alon Levy ha scritto:
> 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

This is probably unwanted.

Paolo
Alon Levy - Nov. 28, 2012, 9:53 a.m.
> Il 28/11/2012 10:16, Alon Levy ha scritto:
> > 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
> 
> This is probably unwanted.

Yes, my bad. I'll drop it in the pull request.

> 
> Paolo
> 
>
Paolo Bonzini - Dec. 19, 2012, 8:33 a.m.
Il 28/11/2012 10:53, Alon Levy ha scritto:
>> Il 28/11/2012 10:16, Alon Levy ha scritto:
>>> > > 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
>> > 
>> > This is probably unwanted.
> Yes, my bad. I'll drop it in the pull request.
> 

Are you going to send it soon?

Paolo
Alon Levy - Dec. 23, 2012, 8:35 p.m.
On Wed, Dec 19, 2012 at 09:33:28AM +0100, Paolo Bonzini wrote:
> Il 28/11/2012 10:53, Alon Levy ha scritto:
> >> Il 28/11/2012 10:16, Alon Levy ha scritto:
> >>> > > 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
> >> > 
> >> > This is probably unwanted.
> > Yes, my bad. I'll drop it in the pull request.
> > 
> 
> Are you going to send it soon?

I didn't manage to do this, I guess your new series includes this? I'll
try to review it.

> 
> Paolo

Patch

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