Changeset 2978 for trunk/kBuild/units/qt5.kmk

Timestamp:

Sep 27, 2016, 4:32:29 PM (9 years ago)

Author:

bird

Message:

qt4.kmk,qt5.kmk: fix & synced them

File:

• trunk/kBuild/units/qt5.kmk (modified) (2 diffs)

trunk/kBuild/units/qt5.kmk

@@ -257 +257 @@
          )))
   else
-   PATH_TOOL_QT5_BIN := $(patsubst %/moc-qt5,%,$(firstword $(wildcard \
+   # No suffix given, so before we check out -qt5 look at qt5 specific locations to avoid choosers and symlinks.
+   PATH_TOOL_QT4_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/moc) \
+        $(if $(intersects $(KBUILD_HOST_ARCH), $(KBUILD_ARCHES_64)),/usr/lib64/qt5/bin/moc,) \
+        /usr/lib/qt5/bin/moc \
+        /usr/local/lib/qt5/bin/moc \
+        /usr/qt/5/bin/moc \
+        /usr/local/qt/5/bin/moc \
+        /usr/share/qt5/bin/moc \
+        /usr/local/share/qt5/bin/moc \
+        )))
+   ifeq ($(PATH_TOOL_QT5_BIN),)
+    PATH_TOOL_QT5_BIN := $(patsubst %/moc-qt5,%,$(firstword $(wildcard \
         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/moc-qt5) \
         /usr/lib/qt5/bin/moc-qt5 \
@@ -265 +277 @@
         /usr/bin/moc-qt5 \
         )))
-   ifneq ($(PATH_TOOL_QT5_BIN),)
-    TOOL_QT5_BIN_SUFF := -qt5
-   else
-    # If no luck, try looking for moc in the qt5 specific locations.
-    PATH_TOOL_QT5_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/moc) \
-        /usr/lib/qt5/bin/moc \
-        /usr/qt/5/bin/moc \
-        /usr/share/qt5/bin/moc \
-        )))
+    ifneq ($(PATH_TOOL_QT5_BIN),)
+     TOOL_QT5_BIN_SUFF := -qt5
+    endif
    endif
   endif