mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
move "ln -sf" emulation to a function
"ln -sf" does not really do anything more than "ln -s" on Solaris. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
3ec87ffe17
commit
11568d6df9
26
configure
vendored
26
configure
vendored
|
@ -32,6 +32,12 @@ compile_prog() {
|
||||||
$cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log 2>&1
|
$cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# symbolically link $1 to $2. Portable version of "ln -sf".
|
||||||
|
symlink() {
|
||||||
|
rm -f $2
|
||||||
|
ln -s $1 $2
|
||||||
|
}
|
||||||
|
|
||||||
# check whether a command is available to this shell (may be either an
|
# check whether a command is available to this shell (may be either an
|
||||||
# executable or a builtin)
|
# executable or a builtin)
|
||||||
has() {
|
has() {
|
||||||
|
@ -2811,8 +2817,7 @@ fi
|
||||||
|
|
||||||
for d in libdis libdis-user; do
|
for d in libdis libdis-user; do
|
||||||
mkdir -p $d
|
mkdir -p $d
|
||||||
rm -f $d/Makefile
|
symlink $source_path/Makefile.dis $d/Makefile
|
||||||
ln -s $source_path/Makefile.dis $d/Makefile
|
|
||||||
echo > $d/config.mak
|
echo > $d/config.mak
|
||||||
done
|
done
|
||||||
if test "$static" = "no" -a "$user_pie" = "yes" ; then
|
if test "$static" = "no" -a "$user_pie" = "yes" ; then
|
||||||
|
@ -2876,12 +2881,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
|
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
|
mkdir -p $target_dir/nwfpe
|
||||||
fi
|
fi
|
||||||
|
symlink $source_path/Makefile.target $target_dir/Makefile
|
||||||
#
|
|
||||||
# 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
|
|
||||||
|
|
||||||
|
|
||||||
echo "# Automatically generated by configure - do not modify" > $config_target_mak
|
echo "# Automatically generated by configure - do not modify" > $config_target_mak
|
||||||
|
@ -3250,10 +3250,8 @@ if test "$source_path_used" = "yes" ; then
|
||||||
for dir in $DIRS ; do
|
for dir in $DIRS ; do
|
||||||
mkdir -p $dir
|
mkdir -p $dir
|
||||||
done
|
done
|
||||||
# remove the link and recreate it, as not all "ln -sf" overwrite the link
|
|
||||||
for f in $FILES ; do
|
for f in $FILES ; do
|
||||||
rm -f $f
|
symlink $source_path/$f $f
|
||||||
ln -s $source_path/$f $f
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -3275,15 +3273,13 @@ for hwlib in 32 64; do
|
||||||
d=libhw$hwlib
|
d=libhw$hwlib
|
||||||
mkdir -p $d
|
mkdir -p $d
|
||||||
mkdir -p $d/ide
|
mkdir -p $d/ide
|
||||||
rm -f $d/Makefile
|
symlink $source_path/Makefile.hw $d/Makefile
|
||||||
ln -s $source_path/Makefile.hw $d/Makefile
|
|
||||||
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
|
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
|
||||||
done
|
done
|
||||||
|
|
||||||
d=libuser
|
d=libuser
|
||||||
mkdir -p $d
|
mkdir -p $d
|
||||||
rm -f $d/Makefile
|
symlink $source_path/Makefile.user $d/Makefile
|
||||||
ln -s $source_path/Makefile.user $d/Makefile
|
|
||||||
if test "$static" = "no" -a "$user_pie" = "yes" ; then
|
if test "$static" = "no" -a "$user_pie" = "yes" ; then
|
||||||
echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
|
echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue