Skip to content
Permalink
Browse files

configure: Just don't do the -idirafter on QNX.

The compiler understands it, but the "qcc" compiler driver doesn't, and the
standard Khronos headers upset QNX anyhow, since they try to include X11
headers in the __unix__ section.
  • Loading branch information
icculus committed May 19, 2020
1 parent 72fdc80 commit a5c654d5c3624f80d165912fb4fe36955032eed4
Showing with 19 additions and 45 deletions.
  1. +8 −29 configure
  2. +11 −16 configure.ac
@@ -16000,37 +16000,16 @@ case "$host" in
;;
esac

save_CFLAGS="$CFLAGS"
have_idirafter="no"
idirafter="-I"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -idirafter option" >&5
$as_echo_n "checking for -idirafter option... " >&6; }
CFLAGS="$save_CFLAGS -idirafter src"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
INCLUDE="-I$srcdir/include"

have_idirafter="yes"
idirafter="-idirafter "

fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_idirafter" >&5
$as_echo "$have_idirafter" >&6; }
CFLAGS="$save_CFLAGS"
case "$host" in
*-*-nto-qnx*)
;;
*)
INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
;;
esac

INCLUDE="-I$srcdir/include $idirafter$srcdir/src/video/khronos"
if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
elif test -d .hg; then
@@ -69,23 +69,18 @@ case "$host" in
;;
esac

dnl see if -idirafter is available.
save_CFLAGS="$CFLAGS"
have_idirafter="no"
idirafter="-I"
AC_MSG_CHECKING(for -idirafter option)
CFLAGS="$save_CFLAGS -idirafter src"
AC_TRY_COMPILE([
],[
],[
have_idirafter="yes"
idirafter="-idirafter "
])
AC_MSG_RESULT($have_idirafter)
CFLAGS="$save_CFLAGS"

dnl Set up the compiler and linker flags
INCLUDE="-I$srcdir/include $idirafter$srcdir/src/video/khronos"
INCLUDE="-I$srcdir/include"

dnl Don't use our khronos headers on QNX.
case "$host" in
*-*-nto-qnx*)
;;
*)
INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
;;
esac

if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
elif test -d .hg; then

0 comments on commit a5c654d

Please sign in to comment.