Merge pull request #9959 from dev-0x7C6/master

Fixed more compiler invokes in configure stage.
libretro · Jan 7, 2020 · 572611f · 572611f
2 parents 6d4b1b6 + 562bf11
commit 572611f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -23,18 +23,18 @@ 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
 		for moc in "moc-$QT_VERSION" moc; do
 			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