From 382d99173aaeef0a82de8feefb3ba0583bf2fea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 1 Apr 2013 15:26:23 +0200 Subject: [PATCH] Only set QMAKE_DEFAULT_LIB/INCDIRS for target builds The default lib and include dirs are resolved using the target compiler and with a sysroot, so they are not relevant for host builds. Change-Id: Iceb2eb865d0732b9a6f5896ad126200ae8e8a04e Reviewed-by: Oswald Buddenhagen --- configure | 4 ++-- tools/configure/configureapp.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 62e167baae..1983b4de38 100755 --- a/configure +++ b/configure @@ -6394,9 +6394,9 @@ host_build { } else { QT_ARCH = $CFG_ARCH QT_CPU_FEATURES = $CFG_CPUFEATURES + QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` + QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` } -QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` -QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '` QT_EDITION = $Edition QT_CONFIG += $QT_CONFIG diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9a8aaa5d28..534f7bfb91 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3148,12 +3148,12 @@ void Configure::generateQConfigPri() configStream << "} else {" << endl; configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; - configStream << "}" << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection - configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; - configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; + configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; + configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; } + configStream << "}" << endl; if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; else