https://github.com/python/cpython/commit/b3c6b2c9e19ea84f617c13399c411044afbc3813
commit: b3c6b2c9e19ea84f617c13399c411044afbc3813
branch: main
author: Erlend E. Aasland <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-10-20T23:08:01+02:00
summary:
gh-125698: Restore EXEEXT in configure and Make (#125758)
This reverts commit e924bb667.
files:
M Makefile.pre.in
M configure
M configure.ac
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 9c313c8029fb68..fb6f22d57397db 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -176,7 +176,7 @@ EXPORTSYMS= @EXPORTSYMS@
EXPORTSFROM= @EXPORTSFROM@
# Executable suffix (.exe on Windows and Mac OS X)
-EXE= @EXE_SUFFIX@
+EXE= @EXEEXT@
BUILDEXE= @BUILDEXEEXT@
# Name of the patch file to apply for app store compliance
diff --git a/configure b/configure
index ab35f69f73011f..b11f41d5379958 100755
--- a/configure
+++ b/configure
@@ -7296,11 +7296,11 @@ then :
withval=$with_suffix;
case $with_suffix in #(
no) :
- EXE_SUFFIX= ;; #(
+ EXEEXT= ;; #(
yes) :
- EXE_SUFFIX=.exe ;; #(
+ EXEEXT=.exe ;; #(
*) :
- EXE_SUFFIX=$with_suffix
+ EXEEXT=$with_suffix
;;
esac
@@ -7308,20 +7308,20 @@ else $as_nop
case $ac_sys_system/$ac_sys_emscripten_target in #(
Emscripten/browser*) :
- EXE_SUFFIX=.js ;; #(
+ EXEEXT=.js ;; #(
Emscripten/node*) :
- EXE_SUFFIX=.js ;; #(
+ EXEEXT=.js ;; #(
WASI/*) :
- EXE_SUFFIX=.wasm ;; #(
+ EXEEXT=.wasm ;; #(
*) :
- EXE_SUFFIX=
+ EXEEXT=
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXE_SUFFIX" >&5
-printf "%s\n" "$EXE_SUFFIX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5
+printf "%s\n" "$EXEEXT" >&6; }
# Test whether we're running on a non-case-sensitive system, in which
# case we give a warning if no ext is given
@@ -7332,7 +7332,7 @@ if test ! -d CaseSensitiveTestDir; then
mkdir CaseSensitiveTestDir
fi
-if test -d casesensitivetestdir && test -z "$EXE_SUFFIX"
+if test -d casesensitivetestdir && test -z "$EXEEXT"
then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -7340,7 +7340,7 @@ printf "%s\n" "yes" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- BUILDEXEEXT=$EXE_SUFFIX
+ BUILDEXEEXT=$EXEEXT
fi
rmdir CaseSensitiveTestDir
diff --git a/configure.ac b/configure.ac
index 9e50eae6a7ece8..d5bc739c34c90f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1325,19 +1325,19 @@ AC_ARG_WITH([suffix],
[AS_HELP_STRING([--with-suffix=SUFFIX], [set executable suffix to
SUFFIX (default is empty, yes is mapped to '.exe')])],
[
AS_CASE([$with_suffix],
- [no], [EXE_SUFFIX=],
- [yes], [EXE_SUFFIX=.exe],
- [EXE_SUFFIX=$with_suffix]
+ [no], [EXEEXT=],
+ [yes], [EXEEXT=.exe],
+ [EXEEXT=$with_suffix]
)
], [
AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
- [Emscripten/browser*], [EXE_SUFFIX=.js],
- [Emscripten/node*], [EXE_SUFFIX=.js],
- [WASI/*], [EXE_SUFFIX=.wasm],
- [EXE_SUFFIX=]
+ [Emscripten/browser*], [EXEEXT=.js],
+ [Emscripten/node*], [EXEEXT=.js],
+ [WASI/*], [EXEEXT=.wasm],
+ [EXEEXT=]
)
])
-AC_MSG_RESULT([$EXE_SUFFIX])
+AC_MSG_RESULT([$EXEEXT])
# Test whether we're running on a non-case-sensitive system, in which
# case we give a warning if no ext is given
@@ -1347,13 +1347,13 @@ if test ! -d CaseSensitiveTestDir; then
mkdir CaseSensitiveTestDir
fi
-if test -d casesensitivetestdir && test -z "$EXE_SUFFIX"
+if test -d casesensitivetestdir && test -z "$EXEEXT"
then
AC_MSG_RESULT([yes])
BUILDEXEEXT=.exe
else
AC_MSG_RESULT([no])
- BUILDEXEEXT=$EXE_SUFFIX
+ BUILDEXEEXT=$EXEEXT
fi
rmdir CaseSensitiveTestDir
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
