Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-125698: Restore EXEEXT in configure and Make (#125758) 

This reverts commit e924bb667.
This commit is contained in:
Erlend E. Aasland 2024-10-20 23:08:01 +02:00 committed by GitHub
parent ed24702bd0
commit b3c6b2c9e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -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

22
configure generated vendored
View File

@ -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

20
configure.ac
View File

@ -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