[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] configure: Pull linux-headers/asm symlink creation
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH] configure: Pull linux-headers/asm symlink creation out of loop |
Date: |
Wed, 30 Nov 2011 11:59:04 +0000 |
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>
---
configure | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 5fbd812..cc6c6d9 100755
--- a/configure
+++ b/configure
@@ -3281,6 +3281,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
@@ -3606,6 +3622,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
@@ -3737,23 +3757,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.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] configure: Pull linux-headers/asm symlink creation out of loop,
Peter Maydell <=