[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 40/46] simplify fdt libs selection
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 40/46] simplify fdt libs selection |
Date: |
Fri, 24 Jul 2009 20:30:40 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 4 ----
configure | 9 +++++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index a06278f..e23a2c6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -514,9 +514,7 @@ CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
endif
obj-ppc-$(CONFIG_FDT) += device_tree.o
-ifdef FDT_LIBS
LIBS+= $(FDT_LIBS)
-endif
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o
rc4030.o
@@ -542,9 +540,7 @@ obj-microblaze-y += xilinx_ethlite.o
obj-microblaze-y += pflash_cfi02.o
obj-microblaze-$(CONFIG_FDT) += device_tree.o
-ifdef FDT_LIBS
LIBS+= $(FDT_LIBS)
-endif
# Boards
obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o
diff --git a/configure b/configure
index 3f586cc..7d7ef74 100755
--- a/configure
+++ b/configure
@@ -1257,11 +1257,12 @@ fi
##########################################
# fdt probe
if test "$fdt" = "yes" ; then
- fdt=no
- cat > $TMPC << EOF
+ fdt=no
+ fdt_libs="-lfdt"
+ cat > $TMPC << EOF
int main(void) { return 0; }
EOF
- if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lfdt 2> /dev/null >
/dev/null ; then
+ if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC $fdt_libs 2> /dev/null >
/dev/null ; then
fdt=yes
fi
fi
@@ -1711,7 +1712,7 @@ fi
if test "$fdt" = "yes" ; then
echo "CONFIG_FDT=y" >> $config_host_mak
echo "#define CONFIG_FDT 1" >> $config_host_h
- echo "FDT_LIBS=-lfdt" >> $config_host_mak
+ echo "FDT_LIBS=$fdt_libs" >> $config_host_mak
fi
# XXX: suppress that
--
1.6.2.5
- [Qemu-devel] Re: [PATCH 22/46] rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H, (continued)
- [Qemu-devel] [PATCH 32/46] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 34/46] remove sdl_static. Just do the right thing if static is yes, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 33/46] target_softmmu is undefined at that point, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 36/46] Define and use xen libs in a single place, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 35/46] indent with 2 spaces sdl tests, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 37/46] simplify curses library selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 38/46] simplify brlapi selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 39/46] simplify vde libs selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 40/46] simplify fdt libs selection,
Juan Quintela <=
- [Qemu-devel] [PATCH 41/46] test if xen is enabled only once, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 42/46] define ENOTSUP the same that the other errors, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 43/46] rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 44/46] rename USE_NPTL to CONFIG_USE_NPTL, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 46/46] Generate config-host.h from config-host.mak, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 45/46] Remove AUDIO_DRIVERS define, Juan Quintela, 2009/07/24