Skip to contentSkip to conversation

configure: remove dead code for in-tree builds

PATCH In review Paolo Bonzini 2 participants 2 messages Sep 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Cc Daniel P. Berrangé <[email protected]>
---
 configure | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
configure +2 -12
index 8a3acef89d..7598bfbe4d 100755
@@ -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)
@@ -4261,9 +4253,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="-L$PWD/dtc/libfdt"
           fdt_libs="$fdt_libs"
@@ -8097,7 +8087,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
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Paolo Bonzini

The $pwd_is_source_path variable is never "y", since configure re-executes itself from a build directory. Remove code that will never run.

Cc Daniel P. Berrangé <[email protected]>
---
 configure | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|