Skip to content

Commit

Permalink
Update configure scripts
Browse files Browse the repository at this point in the history 
Update configure scripts
  • Loading branch information
@cocoa-xu
cocoa-xu committed Feb 19, 2024
1 parent e7b1a78 commit 0dc9a4c
Show file tree
Hide file tree
Showing 10 changed files with 542 additions and 112 deletions.
71 changes: 57 additions & 14 deletions erts/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3794,12 +3794,26 @@ test -n "$target_alias" &&

# Adjust for local legacy windows hack...
case $host in #(
local-*-windows) :
local-aarch64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=
host_cpu=aarch64
;; #(
local-x86_64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=x86_64
;; #(
local-i686-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=i686
;; #(
*) :
;;
Expand All @@ -3808,12 +3822,26 @@ esac

# Adjust for local legacy windows hack...
case $build in #(
local-*-windows) :
local-aarch64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=aarch64
;; #(
local-x86_64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=
build_cpu=x86_64
;; #(
local-i686-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=i686
;; #(
*) :
;;
Expand All @@ -3822,29 +3850,44 @@ esac

# Adjust for local legacy windows hack...
case $target in #(
local-*-windows) :
local-aarch64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=aarch64
;; #(
local-x86_64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=x86_64
;; #(
local-i686-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=
target_cpu=i686
;; #(
*) :
;;
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.
Expand Down Expand Up @@ -6402,11 +6445,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
if test ${ac_cv_prog_cxx_cxx11+y}
if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_cxx11=no
ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Expand Down Expand Up @@ -6448,11 +6491,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
if test ${ac_cv_prog_cxx_cxx98+y}
if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_cv_prog_cxx_cxx98=no
ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Expand Down
63 changes: 53 additions & 10 deletions lib/common_test/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2044,12 +2044,26 @@ test -n "$target_alias" &&

# Adjust for local legacy windows hack...
case $host in #(
local-*-windows) :
local-aarch64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=
host_cpu=aarch64
;; #(
local-x86_64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=x86_64
;; #(
local-i686-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=i686
;; #(
*) :
;;
Expand All @@ -2058,12 +2072,26 @@ esac

# Adjust for local legacy windows hack...
case $build in #(
local-*-windows) :
local-aarch64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=aarch64
;; #(
local-x86_64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=
build_cpu=x86_64
;; #(
local-i686-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=i686
;; #(
*) :
;;
Expand All @@ -2072,29 +2100,44 @@ esac

# Adjust for local legacy windows hack...
case $target in #(
local-*-windows) :
local-aarch64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=aarch64
;; #(
local-x86_64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=x86_64
;; #(
local-i686-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=
target_cpu=i686
;; #(
*) :
;;
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.
Expand Down
63 changes: 53 additions & 10 deletions lib/crypto/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3135,12 +3135,26 @@ test -n "$target_alias" &&

# Adjust for local legacy windows hack...
case $host in #(
local-*-windows) :
local-aarch64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=
host_cpu=aarch64
;; #(
local-x86_64-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=x86_64
;; #(
local-i686-*-windows) :

host=win32
host_os=win32
host_vendor=
host_cpu=i686
;; #(
*) :
;;
Expand All @@ -3149,12 +3163,26 @@ esac

# Adjust for local legacy windows hack...
case $build in #(
local-*-windows) :
local-aarch64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=aarch64
;; #(
local-x86_64-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=
build_cpu=x86_64
;; #(
local-i686-*-windows) :

build=win32
build_os=win32
build_vendor=
build_cpu=i686
;; #(
*) :
;;
Expand All @@ -3163,29 +3191,44 @@ esac

# Adjust for local legacy windows hack...
case $target in #(
local-*-windows) :
local-aarch64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=aarch64
;; #(
local-x86_64-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=x86_64
;; #(
local-i686-*-windows) :

target=win32
target_os=win32
target_vendor=
target_cpu=
target_cpu=i686
;; #(
*) :
;;
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.
Expand Down
Loading

0 comments on commit 0dc9a4c

Please sign in to comment.