diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-01 03:23:47 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-08 11:43:16 +0200 |
| commit | 0f4d8894df5c1f0d54b50331e36e8894757d9f7e (patch) | |
| tree | 76465d95589736a580408b23eeca8453c87ac156 | |
| parent | 4fbcdcd74237549d2d30facf670bf0006bcf5ea9 (diff) | |
| download | focaccia-qemu-0f4d8894df5c1f0d54b50331e36e8894757d9f7e.tar.gz focaccia-qemu-0f4d8894df5c1f0d54b50331e36e8894757d9f7e.zip | |
configure: remove dead code for in-tree builds
The $pwd_is_source_path variable is never "y", since configure re-executes itself from a build directory. Remove code that will never run. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure b/configure index 1471b35d96..cd17f3d65d 100755 --- a/configure +++ b/configure @@ -665,14 +665,6 @@ QEMU_INCLUDES="$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl" CFLAGS="-std=gnu99 -Wall" -# running configure in the source tree? -# we know that's the case if configure is there. -if test -f "./configure"; then - pwd_is_source_path="y" -else - pwd_is_source_path="n" -fi - check_define() { cat > $TMPC <<EOF #if !defined($1) @@ -4262,9 +4254,7 @@ EOF if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then fdt=git mkdir -p dtc - if [ "$pwd_is_source_path" != "y" ] ; then - symlink "$source_path/dtc/Makefile" "dtc/Makefile" - fi + symlink "$source_path/dtc/Makefile" "dtc/Makefile" fdt_cflags="-I${source_path}/dtc/libfdt" fdt_ldflags="-Ldtc/libfdt" fdt_libs="$fdt_libs" @@ -8088,7 +8078,7 @@ do done mkdir -p $DIRS for f in $LINKS ; do - if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then + if [ -e "$source_path/$f" ]; then symlink "$source_path/$f" "$f" fi done |