44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
Date: Wed, 8 May 2013 23:54:35 +0200
|
|
Subject: [PATCH 13/13] 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
|
|
|
|
Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
configure | 15 +--------------
|
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index d4131dc..fcd8ecc 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -740,20 +740,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
|
|
|