[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] assume existence of "ln -sf"
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/14] assume existence of "ln -sf" |
Date: |
Sun, 14 Nov 2010 12:48:59 +0100 |
The code in this patch was introduced for a Solaris port, but
ln -sf exists in Solaris 2.6 at least.
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index 2d2d306..5a3b127 100755
--- a/configure
+++ b/configure
@@ -2676,8 +2676,7 @@ fi
for d in libdis libdis-user; do
mkdir -p $d
- rm -f $d/Makefile
- ln -s $source_path/Makefile.dis $d/Makefile
+ ln -sf $source_path/Makefile.dis $d/Makefile
echo > $d/config.mak
done
if test "$static" = "no" -a "$user_pie" = "yes" ; then
@@ -2741,12 +2740,7 @@ mkdir -p $target_dir/ide
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o
"$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
mkdir -p $target_dir/nwfpe
fi
-
-#
-# don't use ln -sf as not all "ln -sf" over write the file/link
-#
-rm -f $target_dir/Makefile
-ln -s $source_path/Makefile.target $target_dir/Makefile
+ln -sf $source_path/Makefile.target $target_dir/Makefile
echo "# Automatically generated by configure - do not modify" >
$config_target_mak
@@ -3115,10 +3109,8 @@ if test "$source_path_used" = "yes" ; then
for dir in $DIRS ; do
mkdir -p $dir
done
- # remove the link and recreate it, as not all "ln -sf" overwrite the link
for f in $FILES ; do
- rm -f $f
- ln -s $source_path/$f $f
+ test -f $f || ln -sf $source_path/$f $f
done
fi
@@ -3140,15 +3132,14 @@ for hwlib in 32 64; do
d=libhw$hwlib
mkdir -p $d
mkdir -p $d/ide
- rm -f $d/Makefile
- ln -s $source_path/Makefile.hw $d/Makefile
+ ln -sf $source_path/Makefile.hw $d/Makefile
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
done
d=libuser
mkdir -p $d
rm -f $d/Makefile
-ln -s $source_path/Makefile.user $d/Makefile
+ln -sf $source_path/Makefile.user $d/Makefile
if test "$static" = "no" -a "$user_pie" = "yes" ; then
echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
fi
--
1.7.2.3
- [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables, (continued)
- [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 02/14] default make and install to environment variables, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 03/14] move feature variables to the top, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 04/14] fix sparse support (?), Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf",
Paolo Bonzini <=
- [Qemu-devel] [PATCH 12/14] simplify source_path handling, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak, Paolo Bonzini, 2010/11/14
- Re: [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script, Blue Swirl, 2010/11/14