summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Donnelly <mingw.android@gmail.com>2013-05-11 22:36:51 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-13 15:39:35 +0200
commita9952689c71ffa1204151238820405316f1fe657 (patch)
tree7ea81b5275bd14818967e431481cb5320ae14f3f
parente63d262b6ad43653271e004738a22f085b683b0f (diff)
MSYS: Force relpath and outpath into same pathing namespace.
MSYS bash (and other msys-compiled executables) perform path transformation much like Cygwin. This causes syncqt path substitution to not work correctly, so use 'pwd -W' to get the Windows version (though with forward slashes) of both relpath and outpath. Change-Id: I808e3ef9206ed5f5bd8b6879d12afe664e589e0c Reviewed-by: Alvaro Burnett <alvaroburnett@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index e1e455eeaf..8c6e8ef1f5 100755
--- a/configure
+++ b/configure
@@ -446,6 +446,8 @@ if [ "$OSTYPE" = "msys" ]; then
BUILD_ON_MSYS=yes
DEV_NULL=/tmp/empty-file
echo "" > $DEV_NULL
+ relpath=`(cd "$relpath"; pwd -W)`
+ outpath=`pwd -W`
fi
#-------------------------------------------------------------------------------