Changeset 2976 in kBuild

Timestamp:

Sep 27, 2016 2:29:14 PM (8 years ago)

Author:

bird

Message:

qt4.kmk: check specific qt4 locations before checking out the -qt4 suffix

File:

• trunk/kBuild/units/qt4.kmk (modified) (3 diffs)

trunk/kBuild/units/qt4.kmk

@@ -246 +246 @@
    TOOL_QT4_BIN_SUFF := $(TOOL_QT4_BIN_SUFF)
   endif
-  # Try looking for moc-qt4 / moc-$(suffix) first.
+  # Try looking for moc-$(suffix) first, if specified.
   ifneq ($(TOOL_QT4_BIN_SUFF),)
    PATH_TOOL_QT4_BIN := $(patsubst %/moc$(TOOL_QT4_BIN_SUFF),%,$(firstword $(wildcard \
@@ -257 +257 @@
          )))
   else
-   PATH_TOOL_QT4_BIN := $(patsubst %/moc-qt4,%,$(firstword $(wildcard \
+   # No suffix given, so before we check out -qt4 look at qt4 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)/qt4/bin/moc-qt4) \
+        $(if $(intersects $(KBUILD_HOST_ARCH), $(KBUILD_ARCHES_64)),/usr/lib64/qt4/bin/moc,) \
+        /usr/lib/qt4/bin/moc \
+        /usr/local/lib/qt4/bin/moc \
+        /usr/qt/4/bin/moc \
+        /usr/local/qt/4/bin/moc \
+        /usr/share/qt4/bin/moc \
+        /usr/local/share/qt4/bin/moc \
+        ))) \
+   ifeq ($(PATH_TOOL_QT4_BIN),)
+    PATH_TOOL_QT4_BIN := $(patsubst %/moc-qt4,%,$(firstword $(wildcard \
         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/moc-qt4) \
         /usr/lib/qt4/bin/moc-qt4 \
@@ -265 +277 @@
         /usr/bin/moc-qt4 \
         )))
-   ifneq ($(PATH_TOOL_QT4_BIN),)
-    TOOL_QT4_BIN_SUFF := -qt4
-   else
-    # If no luck, try looking for moc in the qt4 specific locations.
-    PATH_TOOL_QT4_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/moc) \
-        /usr/lib/qt4/bin/moc \
-        /usr/qt/4/bin/moc \
-        /usr/share/qt4/bin/moc \
-        )))
+    ifneq ($(PATH_TOOL_QT4_BIN),)
+     TOOL_QT4_BIN_SUFF := -qt4
+    endif
    endif
   endif