mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 03:13:44 +08:00
remove source_path_used
Not necessary since we use mkdir -p and from this patch test -f. Also, dirname returns "." if a path has no directory component, as is the case for "sh configure". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
11568d6df9
commit
d1807a4f83
45
configure
vendored
45
configure
vendored
@ -480,14 +480,7 @@ fi
|
||||
|
||||
# find source path
|
||||
source_path=`dirname "$0"`
|
||||
source_path_used="no"
|
||||
workdir=`pwd`
|
||||
if [ -z "$source_path" ]; then
|
||||
source_path=$workdir
|
||||
else
|
||||
source_path=`cd "$source_path"; pwd`
|
||||
fi
|
||||
[ -f "$workdir/vl.c" ] || source_path_used="yes"
|
||||
source_path=`cd "$source_path"; pwd`
|
||||
|
||||
werror=""
|
||||
|
||||
@ -501,7 +494,6 @@ for opt do
|
||||
--interp-prefix=*) interp_prefix="$optarg"
|
||||
;;
|
||||
--source-path=*) source_path="$optarg"
|
||||
source_path_used="yes"
|
||||
;;
|
||||
--cross-prefix=*)
|
||||
;;
|
||||
@ -3234,26 +3226,21 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
|
||||
|
||||
done # for target in $targets
|
||||
|
||||
# build tree in object directory if source path is different from current one
|
||||
if test "$source_path_used" = "yes" ; then
|
||||
DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
|
||||
DIRS="$DIRS roms/seabios roms/vgabios"
|
||||
DIRS="$DIRS fsdev ui"
|
||||
FILES="Makefile tests/Makefile"
|
||||
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
|
||||
FILES="$FILES tests/test-mmap.c"
|
||||
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
|
||||
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
|
||||
for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
|
||||
FILES="$FILES pc-bios/`basename $bios_file`"
|
||||
done
|
||||
for dir in $DIRS ; do
|
||||
mkdir -p $dir
|
||||
done
|
||||
for f in $FILES ; do
|
||||
symlink $source_path/$f $f
|
||||
done
|
||||
fi
|
||||
# build tree in object directory in case the source is not in the current directory
|
||||
DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
|
||||
DIRS="$DIRS roms/seabios roms/vgabios"
|
||||
DIRS="$DIRS fsdev ui"
|
||||
FILES="Makefile tests/Makefile"
|
||||
FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
|
||||
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
|
||||
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
|
||||
for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
|
||||
FILES="$FILES pc-bios/`basename $bios_file`"
|
||||
done
|
||||
mkdir -p $DIRS
|
||||
for f in $FILES ; do
|
||||
test -f $f || symlink $source_path/$f $f
|
||||
done
|
||||
|
||||
# temporary config to build submodules
|
||||
for rom in seabios vgabios ; do
|
||||
|
Loading…
Reference in New Issue
Block a user