Mercurial > mxe-octave

changeset 3041:622b49d8b178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't set qt CROSS_COMPILE device option for native builds
author John W. Eaton <jwe@octave.org>
date Mon, 10 Jun 2013 15:25:32 -0400
parents 706c4daf3372
children ace9dd211c99
files src/qt.mk
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Mon Jun 10 13:17:20 2013 -0400
+++ b/src/qt.mk	Mon Jun 10 15:25:32 2013 -0400
@@ -27,6 +27,8 @@
   $(PKG)_CONFIGURE_DATABASE_OPTION := -qt-sql-psql
 else
   ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
+      -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
     $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++-4.6
     $(PKG)_CONFIGURE_DATABASE_OPTION := \
       -qt-sql-sqlite -qt-sql-odbc -qt-sql-psql -qt-sql-tds -D Q_USE_SYBASE 
@@ -50,7 +52,7 @@
         -confirm-license \
         -fast \
         $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
-        -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) \
+        $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
         -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
         -force-pkg-config \
         -release \