Merge pull request #8734 from cocoa-xu/cx-arm64-win-configure

Update configure scripts for `local-aarch64-*-windows`
erlang · Sep 19, 2024 · 0dd8b1c · 0dd8b1c
2 parents f39b922 + 7a52a45
commit 0dd8b1c
Show file tree

Hide file tree

Showing 10 changed files with 260 additions and 40 deletions.
diff --git a/erts/configure b/erts/configure
@@ -3837,6 +3837,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -3851,6 +3858,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -3865,6 +3879,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -3876,18 +3897,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.

diff --git a/lib/common_test/configure b/lib/common_test/configure
@@ -2041,6 +2041,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -2055,6 +2062,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -2069,6 +2083,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -2080,18 +2101,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.

diff --git a/lib/crypto/configure b/lib/crypto/configure
@@ -3160,6 +3160,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -3174,6 +3181,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -3188,6 +3202,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -3199,18 +3220,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.

diff --git a/lib/erl_interface/configure b/lib/erl_interface/configure
@@ -3044,6 +3044,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -3058,6 +3065,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -3072,6 +3086,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -3083,18 +3104,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.

diff --git a/lib/megaco/configure b/lib/megaco/configure
@@ -2904,6 +2904,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -2918,6 +2925,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -2932,6 +2946,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -2943,18 +2964,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.

diff --git a/lib/odbc/configure b/lib/odbc/configure
@@ -3002,6 +3002,13 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -3016,6 +3023,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -3030,6 +3044,13 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -3041,18 +3062,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host"  -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.