[PATCH] configure: put all symlink creation together

Paolo Bonzini posted 1 patch 10 months ago
Failed in applying to current master (apply log)
configure | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] configure: put all symlink creation together
Posted by Paolo Bonzini 10 months ago
Based-on: <20240129133651.1106552-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 9cdb5a6818b..3cd736b139f 100755
--- a/configure
+++ b/configure
@@ -1538,6 +1538,11 @@ for f in $LINKS ; do
     fi
 done
 
+# use included Linux headers for KVM architectures
+if test "$host_os" = "linux" && test -n "$linux_arch"; then
+  symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
+fi
+
 echo "# Automatically generated by configure - do not modify" > Makefile.prereqs
 
 # Mac OS X ships with a broken assembler
@@ -1605,11 +1610,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
 echo "MESON=$meson" >> $config_host_mak
 echo "NINJA=$ninja" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
-# use included Linux headers for KVM architectures
-if test "$host_os" = "linux" && test -n "$linux_arch"; then
-  symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
-fi
-
 if test "$default_targets" = "yes"; then
   echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
 fi
-- 
2.43.0
Re: [PATCH] configure: put all symlink creation together
Posted by Thomas Huth 10 months ago
On 29/01/2024 14.48, Paolo Bonzini wrote:
> Based-on: <20240129133651.1106552-1-pbonzini@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   configure | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/configure b/configure
> index 9cdb5a6818b..3cd736b139f 100755
> --- a/configure
> +++ b/configure
> @@ -1538,6 +1538,11 @@ for f in $LINKS ; do
>       fi
>   done
>   
> +# use included Linux headers for KVM architectures
> +if test "$host_os" = "linux" && test -n "$linux_arch"; then
> +  symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
> +fi
> +
>   echo "# Automatically generated by configure - do not modify" > Makefile.prereqs
>   
>   # Mac OS X ships with a broken assembler
> @@ -1605,11 +1610,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
>   echo "MESON=$meson" >> $config_host_mak
>   echo "NINJA=$ninja" >> $config_host_mak
>   echo "EXESUF=$EXESUF" >> $config_host_mak
> -# use included Linux headers for KVM architectures
> -if test "$host_os" = "linux" && test -n "$linux_arch"; then
> -  symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
> -fi
> -
>   if test "$default_targets" = "yes"; then
>     echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
>   fi

Reviewed-by: Thomas Huth <thuth@redhat.com>