summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-07-17 03:48:34 (GMT)
committerGitHub <noreply@github.com>2016-07-17 03:48:34 (GMT)
commitdc122c2ba98aa1fdeba0c75e31f9e3dd4b092c4a (patch)
tree635202e9e5901069980d21a4c59683ac845b17f6
parent3246cbdf81895737ea059d9a12381557aafa8657 (diff)
parent7d04e40e29ae9412e385f6b6c9cf425cff30c31e (diff)
downloadmxe-dc122c2ba98aa1fdeba0c75e31f9e3dd4b092c4a.zip
mxe-dc122c2ba98aa1fdeba0c75e31f9e3dd4b092c4a.tar.gz
mxe-dc122c2ba98aa1fdeba0c75e31f9e3dd4b092c4a.tar.bz2
Merge pull request #1371 from tonytheodore/qt-mkspecs
qt: symlink mkspecs/default
-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