Bug 1905596 - Move BIN_SUFFIX and HOST_BIN_SUFFIX from old-configure to moz.configure r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D215377

js/src/old-configure.in

@@ -149,15 +149,6 @@ dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 MOZ_ARCH_OPTS
 
-dnl ========================================================
-dnl System overrides of the defaults for host
-dnl ========================================================
-case "$host" in
-*mingw*)
-    HOST_BIN_SUFFIX=.exe
-    ;;
-esac
-
 dnl ========================================================
 dnl System overrides of the defaults for target
 dnl ========================================================
@@ -234,7 +225,6 @@ case "$target" in
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
     dnl See http://support.microsoft.com/kb/143208 to use STL
     AC_DEFINE(NOMINMAX)
-    BIN_SUFFIX='.exe'
 
     case "$host_os" in
     cygwin*|msvc*|mks*)
@@ -371,9 +361,7 @@ AC_SUBST_LIST(OS_LDFLAGS)
 
 AC_SUBST(HOST_CC)
 AC_SUBST(HOST_CXX)
-AC_SUBST(HOST_BIN_SUFFIX)
 
-AC_SUBST(BIN_SUFFIX)
 AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 

moz.configure

@@ -346,15 +346,15 @@ set_config("HOST_IMPORT_LIB_SUFFIX", host_library_name_info.import_lib.suffix)
 set_config("WASM_OBJ_SUFFIX", "wasm")
 
 
-@depends(target)
-def bin_suffix(target):
-    if target.os == "WINNT":
-        return ".exe"
-    else:
-        return ""
+@template
+def bin_suffix(host_or_target):
+    return depends(host_or_target)(
+        lambda host_or_target: ".exe" if host_or_target.os == "WINNT" else ""
+    )
 
 
-set_config("BIN_SUFFIX", bin_suffix)
+set_config("BIN_SUFFIX", bin_suffix(target))
+set_config("HOST_BIN_SUFFIX", bin_suffix(host))
 
 
 @template

old-configure.in

@@ -153,15 +153,6 @@ if test "$COMPILE_ENVIRONMENT"; then
     MOZ_ARCH_OPTS
 fi # COMPILE_ENVIRONMENT
 
-dnl ========================================================
-dnl System overrides of the defaults for host
-dnl ========================================================
-case "$host" in
-*mingw*)
-    HOST_BIN_SUFFIX=.exe
-    ;;
-esac
-
 dnl ========================================================
 dnl System overrides of the defaults for target
 dnl ========================================================
@@ -239,7 +230,6 @@ case "$target" in
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
     dnl See http://support.microsoft.com/kb/143208 to use STL
     AC_DEFINE(NOMINMAX)
-    BIN_SUFFIX='.exe'
 
     case "$host_os" in
     cygwin*|msvc*|mks*)
@@ -524,9 +514,7 @@ AC_SUBST_LIST(OS_LDFLAGS)
 
 AC_SUBST(HOST_CC)
 AC_SUBST(HOST_CXX)
-AC_SUBST(HOST_BIN_SUFFIX)
 
-AC_SUBST(BIN_SUFFIX)
 AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 

toolkit/moz.configure

@@ -1104,7 +1104,7 @@ project_flag(
 
 # Child Process Name for IPC
 # ==============================================================
-@depends(toolkit, bin_suffix)
+@depends(toolkit, bin_suffix(target))
 def moz_child_process_name(toolkit, bin_suffix):
     if toolkit != "android":
         return f"plugin-container{bin_suffix}"