[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/19] configure: Pull linux-headers/asm symlink cre
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 11/19] configure: Pull linux-headers/asm symlink creation out of loop |
Date: |
Tue, 6 Dec 2011 11:01:06 +0000 |
From: Peter Maydell <address@hidden>
Pull the creation of the linux-headers/asm symlink out of the loop
so we don't pointlessly delete and recreate it once for each target.
Also move the setting of the includes variable up so that it is
in the same place as the other code which sets this variable.
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
configure | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 452b8cf..4bcb8ef 100755
--- a/configure
+++ b/configure
@@ -3286,6 +3286,22 @@ for d in libdis libdis-user; do
echo > $d/config.mak
done
+# use included Linux headers
+if test "$linux" = "yes" ; then
+ mkdir -p linux-headers
+ case "$cpu" in
+ i386|x86_64)
+ symlink $source_path/linux-headers/asm-x86 linux-headers/asm
+ ;;
+ ppcemb|ppc|ppc64)
+ symlink $source_path/linux-headers/asm-powerpc linux-headers/asm
+ ;;
+ s390x)
+ symlink $source_path/linux-headers/asm-s390 linux-headers/asm
+ ;;
+ esac
+fi
+
for target in $target_list; do
target_dir="$target"
config_target_mak=$target_dir/config-target.mak
@@ -3611,6 +3627,10 @@ else
fi
includes="-I\$(SRC_PATH)/tcg $includes"
+if test "$linux" = "yes" ; then
+ includes="-I\$(SRC_PATH)/linux-headers $includes"
+fi
+
if test "$target_user_only" = "yes" ; then
libdis_config_mak=libdis-user/config.mak
else
@@ -3742,23 +3762,6 @@ if test "$target_linux_user" = "yes" -o
"$target_bsd_user" = "yes" ; then
esac
fi
-# use included Linux headers
-if test "$linux" = "yes" ; then
- includes="-I\$(SRC_PATH)/linux-headers $includes"
- mkdir -p linux-headers
- case "$cpu" in
- i386|x86_64)
- symlink $source_path/linux-headers/asm-x86 linux-headers/asm
- ;;
- ppcemb|ppc|ppc64)
- symlink $source_path/linux-headers/asm-powerpc linux-headers/asm
- ;;
- s390x)
- symlink $source_path/linux-headers/asm-s390 linux-headers/asm
- ;;
- esac
-fi
-
echo "LDFLAGS+=$ldflags" >> $config_target_mak
echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
--
1.7.7.3
- [Qemu-devel] [PATCH 05/19] configure: Print a banner comment at the top of config.log, (continued)
- [Qemu-devel] [PATCH 05/19] configure: Print a banner comment at the top of config.log, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 10/19] pcie_aer: adjust do_pcie_aer_inejct_error -> do_pcie_aer_inject_error, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 08/19] fix typo: delete redundant semicolon, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 04/19] configure: Include #define name in check_define compiler error, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 09/19] fix spelling in hw sub directory, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 02/19] console: Fix console_putchar() for CSI J, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 06/19] net/socket.c : fix memory leak, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 07/19] win32: fix memory leak, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 03/19] console: Fix qemu_default_pixelformat() for 24 bpp, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 13/19] Convert keymap file to U TF-8 encoding, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 11/19] configure: Pull linux-headers/asm symlink creation out of loop,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 12/19] Convert source files to UTF-8 encoding, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 14/19] linux-user/cpu-uname.c : Convert to UTF-8, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 16/19] Rename get_tls to tls_var, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 15/19] linux-user/arm/nwfpe/fpo pcode.h: Fix non-UTF-8 characters, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 17/19] linux-user/syscall.c: Don't skip stracing for fcntl64 failure case, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 18/19] memory: minor documentation fixes/enhancements, Stefan Hajnoczi, 2011/12/06
- [Qemu-devel] [PATCH 19/19] mips_malta: resolve endless loop when loading bios, Stefan Hajnoczi, 2011/12/06