summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-06-01 15:29:30 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-07-17 03:42:40 (GMT)
commit7d04e40e29ae9412e385f6b6c9cf425cff30c31e (patch)
tree635202e9e5901069980d21a4c59683ac845b17f6 /src
parent3246cbdf81895737ea059d9a12381557aafa8657 (diff)
downloadmxe-7d04e40e29ae9412e385f6b6c9cf425cff30c31e.zip
mxe-7d04e40e29ae9412e385f6b6c9cf425cff30c31e.tar.gz
mxe-7d04e40e29ae9412e385f6b6c9cf425cff30c31e.tar.bz2
qt: symlink mkspecs/default
On OSX, the default mkspec doesn't set `win32-g++` correctly. The following workarounds are possible: - set `QMAKESPEC` env var - use `-spec` command line option - set `CONFIG+=` - symlink mkspecs/default The internal build of qt always seems to use the `-spec` option, but that doesn't solve the default case - the symlink approach used on linux appears to always work. closes #1379
Diffstat (limited to 'src')
-rw-r--r--src/qt.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/qt.mk b/src/qt.mk
index 14198e7..d27214a 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -73,6 +73,13 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4
+ # symlink mkspecs/default if it isn't already
+ # required on OSX to mimic linux installation
+ [[ -L '$(PREFIX)/$(TARGET)/qt/mkspecs/default' ]] || \
+ rm -rf '$(PREFIX)/$(TARGET)/qt/mkspecs/default' && \
+ ln -s '$(PREFIX)/$(TARGET)/qt/mkspecs/win32-g++-4.6' \
+ '$(PREFIX)/$(TARGET)/qt/mkspecs/default'
+
# lrelease (from linguist) needed to prepare translation files
$(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install