diff options
| author | Johannes Zellner <johannes.zellner@nokia.com> | 2012-05-11 17:54:30 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-14 21:23:43 +0200 |
| commit | 26790242c55175bc7298e98ee9b6b29c80b5c468 (patch) | |
| tree | bfdf2581b66ca4f0d61e93389c1a4cde5bbe8c05 /configure | |
| parent | 5764f5e6eaf149116a818658883cf4fae9830f30 (diff) | |
configure: save pkg-config env in qconfig.pri
Store PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR for the usecase of
cross compilation in qconfig.pri. They will get picked up by
pkgConfigExecutable() in qt_functions.prf used from link_pkgconfig.prf
as environment for pkg-config calls.
Change-Id: I7d0de05c0bd21b435275fc26c66a80035ba30970
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -5719,6 +5719,14 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE EOF + +if [ -n "$PKG_CONFIG_SYSROOT_DIR" ] || [ -n "$PKG_CONFIG_LIBDIR" ]; then + echo "# pkgconfig" >> "$QTCONFIG.tmp" + echo "PKG_CONFIG_SYSROOT_DIR = $PKG_CONFIG_SYSROOT_DIR" >> "$QTCONFIG.tmp" + echo "PKG_CONFIG_LIBDIR = $PKG_CONFIG_LIBDIR" >> "$QTCONFIG.tmp" + echo >> $"$QTCONFIG.tmp" +fi + if [ -n "$CFG_SYSROOT" ]; then echo "# sysroot" >>"$QTCONFIG.tmp" echo `basename "$XQMAKESPEC"` \{ >>"$QTCONFIG.tmp" |