diff options
| author | Alon Levy <alevy@redhat.com> | 2012-11-26 14:54:09 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2012-11-28 11:14:50 +0200 |
| commit | e770907683ff449ab5269f4e0773eb7441affdbf (patch) | |
| tree | 0dafc1895dd447b04f8838add09fa56210ec3c89 | |
| parent | 03a36f17d7788e4a1e07b3341b18028aa0206845 (diff) | |
libcacard: use LDFLAGS to produce i686 with --cpu=i386
Signed-off-by: Alon Levy <alevy@redhat.com>
| -rw-r--r-- | libcacard/Makefile | 4 | ||||
| m--------- | roms/openbios | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile index c26aac65c..25bc4a020 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 -Subproject f095c858136896d236931357b8d597f407286f7 +Subproject d1d2787f87167edf487a60e61b9168514d5a743 |