From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is causing issues as we need g++ to be used as linker Upstream-Status: Pending Signed-off-by: Martin Jansa --- configure | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure index dbf99a9..9ca23a4 100755 --- a/configure +++ b/configure @@ -840,20 +840,7 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" -for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS - if [ "${varname}" = "LDFLAGS" ]; then - qmakevarname="LFLAGS" - elif [ "${varname}" = "LD" ]; then - qmakevarname="LINK" - fi - cmd=`echo \ -'if [ -n "\$'${varname}'" ]; then - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" -fi'` - eval "$cmd" -done + # Use CC/CXX to run config.tests mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- 1.8.2.1