Skip to content

Commit

Permalink
Revert "Make sdl2-config interpreter configurable"
Browse files Browse the repository at this point in the history
This reverts commit b9f0055.

Making the interpreter configurable is a band-aid fix.
So revert the workaround until we know the actual cause.
  • Loading branch information
madebr committed Jun 24, 2024
1 parent 99d7b9e commit 8ae7841
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 30 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3176,10 +3176,6 @@ if(SDL_STATIC AND SDL_SHARED AND NOT sdl_static_libname STREQUAL "SDL2")
message(STATUS "\"pkg-config --static --libs sdl2\" will return invalid information")
endif()

set(SDL2_CONFIG_INTERPRETER "/bin/sh")
if(SOLARIS)
set(SDL2_CONFIG_INTERPRETER "/bin/bash")
endif()
# MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}")
# MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}")

Expand Down
13 changes: 0 additions & 13 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,6 @@ ALSA_LIBS
ALSA_CFLAGS
ALLOCA
CPP
SDL2_CONFIG_INTERPRETER
LIBTOOLLINKERTAG
LINKER
SORT
Expand Down Expand Up @@ -18338,18 +18337,6 @@ esac



case "$host" in
# On Solaris, jack must be linked deferred explicitly
# to prevent undefined symbol failures.
*-*-solaris*)
SDL2_CONFIG_INTERPRETER=/bin/bash
;;
*)
SDL2_CONFIG_INTERPRETER=/bin/sh
;;
esac


if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
elif test -d .git; then
Expand Down
12 changes: 0 additions & 12 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,6 @@ esac
AC_SUBST(LINKER)
AC_SUBST(LIBTOOLLINKERTAG)

case "$host" in
# On Solaris, jack must be linked deferred explicitly
# to prevent undefined symbol failures.
*-*-solaris*)
SDL2_CONFIG_INTERPRETER=/bin/bash
;;
*)
SDL2_CONFIG_INTERPRETER=/bin/sh
;;
esac
AC_SUBST(SDL2_CONFIG_INTERPRETER)

if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
elif test -d .git; then
Expand Down
2 changes: 1 addition & 1 deletion sdl2-config.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!@SDL2_CONFIG_INTERPRETER@
#!/bin/sh

# Get the canonical path of the folder containing this script
bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
Expand Down

0 comments on commit 8ae7841

Please sign in to comment.