summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2015-01-06 10:58:06 +0100
committerAdrien Nader <adrien@notk.org>2015-01-06 10:58:06 +0100
commit4e31317c8857ab9ec7e918b9b6a7d42e66c3511a (patch)
treeaef0cdf8f6cb29c3a4755036dde5e147b4306e01
parent461429b3ef1e31ff07defeb6e70aad4e878fb88f (diff)
qt: fix test which decides when to poison qmake and improve the comment.
-rwxr-xr-xl/qt/qt.SlackBuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/l/qt/qt.SlackBuild b/l/qt/qt.SlackBuild
index 9981741..0232bd6 100755
--- a/l/qt/qt.SlackBuild
+++ b/l/qt/qt.SlackBuild
@@ -242,13 +242,13 @@ EOF
# Since the configuration we want is for cross-toolchain, we can only add it
# during the cross_toolchain series. The issue is that qt.conf is searched for
# at basically "$(dirname argv[1])/qt.conf", i.e. it will be
-# ${YYPREFIX_NATIVE}/bin/qt.conf. Fortunately for us it doesn't do anything
-# about symlink so we add a symlink from ${YYPREFIX_CROSS}/bin/qmake to the
-# binary in the native prefix. This however requires the cross prefix to always
-# be before the native one in ${PATH} and this is simply too risky so in
-# addition to that, we rename the qmake binary in order to "poison" it. This is
-# fine since it is only to be used for win-builds.
-if [ x"${TARGET_TRIPLET}" != x"${HOST_TRIPLET}" ]; then
+# ${YYPREFIX_NATIVE}/bin/qt.conf. Fortunately for us it doesn't do any check
+# related to symlinks so we add a symlink from ${YYPREFIX_CROSS}/bin/qmake to
+# the binary in the native prefix. This however requires the cross prefix to
+# always be before the native one in ${PATH} and this is simply too risky so in
+# addition to that, we rename the qmake binary in native_toolchain in order to
+# "poison" it. This is fine since it is only to be used for win-builds.
+if [ x"${TARGET_TRIPLET}" = x"${HOST_TRIPLET}" ] && [ x"${TARGET_TRIPLET}" = x"${BUILD_TRIPLET}" ]; then
mv ${PKG}/${PREFIX}/bin/qmake ${PKG}/${PREFIX}/bin/qmake-poisoned
fi