diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-21 18:13:23 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-13 16:19:39 +0000 |
| commit | c8ae9bf58df8593bd8ecb902e2167768457e5484 (patch) | |
| tree | d9d84fb37fbb79001be9c1ad6fea9f7a0acc0093 | |
| parent | 6ffa3696e0bfa80215e3fe362d9ad01aa8a69442 (diff) | |
write [Paths] to qt.conf only if -external-hostbindir is used
there is no point in overriding the built-in defaults with the same
values.
Change-Id: I24f66b86f751f7044625b5256f3d979ece782cf7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
| -rwxr-xr-x | configure | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -4185,15 +4185,19 @@ QTCONFFILE="$outpath/bin/qt.conf" cat > "$QTCONFFILE" <<EOF [EffectivePaths] Prefix=.. +EOF +if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then + cat >> "$QTCONFFILE" <<EOF [Paths] Prefix=$QT_EXT_PREFIX TargetSpec=$XPLATFORM HostSpec=$PLATFORM EOF -if [ -n "$CFG_SYSROOT" ]; then - cat >> "$QTCONFFILE" <<EOF + if [ -n "$CFG_SYSROOT" ]; then + cat >> "$QTCONFFILE" <<EOF Sysroot=$CFG_SYSROOT EOF + fi fi if [ x"$relpath" != x"$outpath" ]; then cat >> "$QTCONFFILE" <<EOF |