mirror of https://github.com/libsdl-org/SDL.git
Revert "Make sdl2-config interpreter configurable"
This reverts commit b9f005505b.
Making the interpreter configurable is a band-aid fix.
So revert the workaround until we know the actual cause.
This commit is contained in:
parent
99d7b9e626
commit
8ae7841d91
|
|
@ -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")
|
message(STATUS "\"pkg-config --static --libs sdl2\" will return invalid information")
|
||||||
endif()
|
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_LIBS: ${SDL_LIBS}")
|
||||||
# MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}")
|
# MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -727,7 +727,6 @@ ALSA_LIBS
|
||||||
ALSA_CFLAGS
|
ALSA_CFLAGS
|
||||||
ALLOCA
|
ALLOCA
|
||||||
CPP
|
CPP
|
||||||
SDL2_CONFIG_INTERPRETER
|
|
||||||
LIBTOOLLINKERTAG
|
LIBTOOLLINKERTAG
|
||||||
LINKER
|
LINKER
|
||||||
SORT
|
SORT
|
||||||
|
|
@ -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
|
if test x$srcdir != x.; then
|
||||||
INCLUDE="-Iinclude $INCLUDE"
|
INCLUDE="-Iinclude $INCLUDE"
|
||||||
elif test -d .git; then
|
elif test -d .git; then
|
||||||
|
|
|
||||||
12
configure.ac
12
configure.ac
|
|
@ -113,18 +113,6 @@ esac
|
||||||
AC_SUBST(LINKER)
|
AC_SUBST(LINKER)
|
||||||
AC_SUBST(LIBTOOLLINKERTAG)
|
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
|
if test x$srcdir != x.; then
|
||||||
INCLUDE="-Iinclude $INCLUDE"
|
INCLUDE="-Iinclude $INCLUDE"
|
||||||
elif test -d .git; then
|
elif test -d .git; then
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!@SDL2_CONFIG_INTERPRETER@
|
#!/bin/sh
|
||||||
|
|
||||||
# Get the canonical path of the folder containing this script
|
# Get the canonical path of the folder containing this script
|
||||||
bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
|
bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue