mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more compiler invokes in configure stage.

Browse Source
This commit is contained in:
Bartłomiej Burdukiewicz 2020-01-07 15:38:15 +01:00
parent 3d80838754
commit 562bf11946
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qb/qb.libs.sh
View File

@ -164,7 +164,7 @@ check_lib()
answer='no' answer='no'
printf %s "$MSG $lib ... " printf %s "$MSG $lib ... "
eval "set -- $INCLUDE_DIRS $LIBRARY_DIRS $5 $FLAGS $LDFLAGS $lib" eval "set -- $INCLUDE_DIRS $LIBRARY_DIRS $5 $FLAGS $LDFLAGS $lib"
"$COMPILER" -o "$TEMP_EXE" "$TEMP_CODE" "$@" >>config.log 2>&1 && answer='yes' $COMPILER -o "$TEMP_EXE" "$TEMP_CODE" "$@" >>config.log 2>&1 && answer='yes'
printf %s\\n "$answer" printf %s\\n "$answer"
if [ "$answer" = 'yes' ] && [ "$include" ]; then if [ "$answer" = 'yes' ] && [ "$include" ]; then
@ -282,7 +282,7 @@ check_header()
answer='no' answer='no'
printf %s "Checking presence of header file $CHECKHEADER ... " printf %s "Checking presence of header file $CHECKHEADER ... "
eval "set -- $CFLAGS $INCLUDE_DIRS" eval "set -- $CFLAGS $INCLUDE_DIRS"
"$CC" -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes' $CC -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes'
eval "HAVE_$val=\"$answer\"" eval "HAVE_$val=\"$answer\""
printf %s\\n "$answer" printf %s\\n "$answer"
rm -f -- "$TEMP_C" "$TEMP_EXE" rm -f -- "$TEMP_C" "$TEMP_EXE"
@ -318,7 +318,7 @@ EOF
macro="$2" macro="$2"
printf %s "Checking presence of predefined macro $macro$ECHOBUF ... " printf %s "Checking presence of predefined macro $macro$ECHOBUF ... "
eval "set -- $CFLAGS $INCLUDE_DIRS" eval "set -- $CFLAGS $INCLUDE_DIRS"
"$CC" -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes' $CC -o "$TEMP_EXE" "$TEMP_C" "$@" >>config.log 2>&1 && answer='yes'
eval "HAVE_$val=\"$answer\"" eval "HAVE_$val=\"$answer\""
printf %s\\n "$answer" printf %s\\n "$answer"
rm -f -- "$TEMP_C" "$TEMP_EXE" rm -f -- "$TEMP_C" "$TEMP_EXE"

8
qb/qb.moc.sh
View File

@ -23,8 +23,8 @@ if [ "$HAVE_QT" = "yes" ]; then
moc_works=0 moc_works=0
if [ "$MOC" ]; then if [ "$MOC" ]; then
QT_SELECT="$QT_VERSION" \ QT_SELECT="$QT_VERSION" \
"$MOC" -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 && $MOC -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 &&
"$CXX" -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ $CXX -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \
-fPIC -c "$TEMP_CPP" >/dev/null 2>&1 && -fPIC -c "$TEMP_CPP" >/dev/null 2>&1 &&
moc_works=1 moc_works=1
else else
@ -32,9 +32,9 @@ if [ "$HAVE_QT" = "yes" ]; then
MOC="$(exists "$moc")" || MOC="" MOC="$(exists "$moc")" || MOC=""
if [ "$MOC" ]; then if [ "$MOC" ]; then
QT_SELECT="$QT_VERSION" \ QT_SELECT="$QT_VERSION" \
"$MOC" -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 || $MOC -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 ||
continue continue
"$CXX" -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ $CXX -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \
-fPIC -c "$TEMP_CPP" >/dev/null 2>&1 && { -fPIC -c "$TEMP_CPP" >/dev/null 2>&1 && {
moc_works=1 moc_works=1
break break