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 committed Feb 19, 2024
1 parent 4e68abc commit b590118
Show file tree
Hide file tree
Showing 10 changed files with 502 additions and 22 deletions.
58 changes: 53 additions & 5 deletions erts/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3794,6 +3794,22 @@ test -n "$target_alias" &&

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

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

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

host=win32
Expand All @@ -3808,6 +3824,22 @@ esac

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

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

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

build=win32
Expand All @@ -3822,6 +3854,22 @@ esac

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

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

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

target=win32
Expand All @@ -3833,7 +3881,7 @@ 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
Expand Down Expand Up @@ -6402,11 +6450,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 +6496,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
50 changes: 49 additions & 1 deletion lib/common_test/configure
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,22 @@ test -n "$target_alias" &&

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

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

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

host=win32
Expand All @@ -2058,6 +2074,22 @@ esac

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

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

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

build=win32
Expand All @@ -2072,6 +2104,22 @@ esac

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

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

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

target=win32
Expand All @@ -2083,7 +2131,7 @@ 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
Expand Down
50 changes: 49 additions & 1 deletion lib/crypto/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3135,6 +3135,22 @@ test -n "$target_alias" &&

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

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

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

host=win32
Expand All @@ -3149,6 +3165,22 @@ esac

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

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

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

build=win32
Expand All @@ -3163,6 +3195,22 @@ esac

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

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

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

target=win32
Expand All @@ -3174,7 +3222,7 @@ 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
Expand Down
50 changes: 49 additions & 1 deletion lib/erl_interface/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3005,6 +3005,22 @@ test -n "$target_alias" &&

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

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

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

host=win32
Expand All @@ -3019,6 +3035,22 @@ esac

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

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

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

build=win32
Expand All @@ -3033,6 +3065,22 @@ esac

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

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

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

target=win32
Expand All @@ -3044,7 +3092,7 @@ 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
Expand Down
Loading

0 comments on commit b590118

Please sign in to comment.