From 562bf11946165050015455df8b44cee566741759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Tue, 7 Jan 2020 15:38:15 +0100 Subject: [PATCH] Fixed more compiler invokes in configure stage. --- qb/qb.libs.sh | 6 +++--- qb/qb.moc.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index 00c545abcc0..535dfbc45e3 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -164,7 +164,7 @@ check_lib() answer='no' printf %s "$MSG $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" if [ "$answer" = 'yes' ] && [ "$include" ]; then @@ -282,7 +282,7 @@ check_header() answer='no' printf %s "Checking presence of header file $CHECKHEADER ... " 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\"" printf %s\\n "$answer" rm -f -- "$TEMP_C" "$TEMP_EXE" @@ -318,7 +318,7 @@ EOF macro="$2" printf %s "Checking presence of predefined macro $macro$ECHOBUF ... " 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\"" printf %s\\n "$answer" rm -f -- "$TEMP_C" "$TEMP_EXE" diff --git a/qb/qb.moc.sh b/qb/qb.moc.sh index 803a2fe7ab6..4b88601365b 100644 --- a/qb/qb.moc.sh +++ b/qb/qb.moc.sh @@ -23,8 +23,8 @@ if [ "$HAVE_QT" = "yes" ]; then moc_works=0 if [ "$MOC" ]; then QT_SELECT="$QT_VERSION" \ - "$MOC" -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 && - "$CXX" -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ + $MOC -o "$TEMP_CPP" "$TEMP_MOC" >/dev/null 2>&1 && + $CXX -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ -fPIC -c "$TEMP_CPP" >/dev/null 2>&1 && moc_works=1 else @@ -32,9 +32,9 @@ if [ "$HAVE_QT" = "yes" ]; then MOC="$(exists "$moc")" || MOC="" if [ "$MOC" ]; then 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 - "$CXX" -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ + $CXX -o "$TEMP_EXE" $(printf %s "$QT_FLAGS") \ -fPIC -c "$TEMP_CPP" >/dev/null 2>&1 && { moc_works=1 break