Changeset 2323 in kBuild for branches

Timestamp:

Apr 10, 2009 4:15:23 PM (16 years ago)

Author:

bird

Message:

Backported 2272: qt4.kmk: Look for the QT4 tools in the alternative tools tree (x86) when present (amd64).

Location:

branches/kBuild-0.1.5

Files:

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

branches/kBuild-0.1.5/kBuild/units/qt4.kmk

@@ -67 +67 @@
 #       PATH_SDK_QT4_LIB       - The lib directory for KBUILD_TARGET.
 ifndef PATH_SDK_QT4
- PATH_SDK_QT4 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+ PATH_SDK_QT4 := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
  ifeq ($(PATH_SDK_QT4),)
   # If target == host, try look for Qt in the various platform specific places.
@@ -169 +169 @@
   ifeq ($(PATH_SDK_QT4),)
    $(warning kBuild: Couldn't find the Qt4 headers and libaries...)
-   PATH_SDK_QT4 := $(PATH_DEVTOOLS_TRG)/qt/not-found
+   PATH_SDK_QT4 := $(KBUILD_DEVTOOLS_TRG)/qt/not-found
   endif
  endif
@@ -212 +212 @@
 endif
 ifndef PATH_TOOL_QT4_BIN
- PATH_TOOL_QT4_BIN := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v4*/bin)))
+ PATH_TOOL_QT4_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/qt/v4*/bin)))
+ if "$(PATH_TOOL_QT4_BIN)" == "" && "$(KBUILD_DEVTOOLS_HST_ALT)" != ""
+  PATH_TOOL_QT4_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/qt/v4*/bin)))
+ endif
  ifeq ($(PATH_TOOL_QT4_BIN),)
   ifdef TOOL_QT4_BIN_SUFF