summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2010-02-26 12:26:18 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2010-02-26 12:35:23 (GMT)
commit5601e13aa10ad616a3dd9ba263bc14e4c7e39dfb (patch)
tree89bbeb6abb36341dede2ce9a76fc5c5d18871132 /configure
parent9e040eb916f01b78331560722f50cb41bb7f8d4c (diff)
downloadQt-5601e13aa10ad616a3dd9ba263bc14e4c7e39dfb.zip
Qt-5601e13aa10ad616a3dd9ba263bc14e4c7e39dfb.tar.gz
Qt-5601e13aa10ad616a3dd9ba263bc14e4c7e39dfb.tar.bz2
Modified configure script not to override $XPLATFORM in case of CYGWIN
Reviewed-by: Thiago Macieira
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 87551fa..a25dee1 100755
--- a/configure
+++ b/configure
@@ -2407,7 +2407,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
fi
;;
CYGWIN*:*)
- CFG_EMBEDDED=x86
+ if [ -z "$XPLATFORM" ]; then
+ CFG_EMBEDDED=x86
+ fi
;;
*)
echo "Qt for Embedded Linux is not supported on this platform. Disabling."