summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-02 12:29:12 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-03 16:48:33 +0200
commit1b4087ae0c15421d62f9f0cdb6a9c97997fd6ceb (patch)
tree7d0a068a295a54ca92173bdf1ffd70d496690807 /qtbase.pro
parent493b4311ff3995118ac5c15f49803447c8fba854 (diff)
remove special handling of the default{,-host} specs
cp is perfectly capable of properly copying the symlinks Change-Id: Ia45a4521af2ffb70af4e111480c0d6b7999c96c1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qtbase.pro')
-rw-r--r--qtbase.pro22
1 files changed, 11 insertions, 11 deletions
diff --git a/qtbase.pro b/qtbase.pro
index dbcebfaf48..185270a73f 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -116,20 +116,20 @@ INSTALLS += configtests
#mkspecs
mkspecs.path = $$[QT_HOST_DATA]/mkspecs
-mkspecs.files = $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri $$files($$PWD/mkspecs/*)
+mkspecs.files = \
+ $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri \
+ $$files($$PWD/mkspecs/*) # $$OUT_PWD contains only symlinks under Unix
mkspecs.files -= $$PWD/mkspecs/modules
-unix {
- DEFAULT_QMAKESPEC = $$replace(QMAKESPEC, ^.*mkspecs/, )
- DEFAULT_XQMAKESPEC = $$replace(XQMAKESPEC, ^.*mkspecs/, )
- mkspecs.commands = \
- $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default-host $(INSTALL_ROOT)$$mkspecs.path/default; \
- $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default-host && \
- $(SYMLINK) $$DEFAULT_XQMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
- mkspecs.files -= $$PWD/mkspecs/default-host $$PWD/mkspecs/default
-} else:!equals(OUT_PWD, $$PWD) {
- # When shadow building on Windows, the default mkspec only exists in the build tree.
+!equals(OUT_PWD, $$PWD) {
+ # When shadow building, the default mkspecs only exist in the build tree.
mkspecs.files += $$OUT_PWD/mkspecs/default-host $$OUT_PWD/mkspecs/default
}
+!equals(QMAKE_HOST.os, Linux) {
+ # MacOS' (and maybe others') cp command is too daft to honor -f when copying symlinks.
+ mkspecs_pre.commands = rm -f $$[QT_HOST_DATA]/mkspecs/default-host $$[QT_HOST_DATA]/mkspecs/default
+ QMAKE_EXTRA_TARGETS += mkspecs_pre
+ mkspecs.depends += mkspecs_pre
+}
INSTALLS += mkspecs
OTHER_FILES += \