From 48edae4f2770f44a9efb8b76538dc4e945f634ac Mon Sep 17 00:00:00 2001 From: bird Date: Fri, 10 Apr 2009 16:15:23 +0000 Subject: [PATCH] Backported 2272: qt4.kmk: Look for the QT4 tools in the alternative tools tree (x86) when present (amd64). git-svn-id: https://www.virtualbox.org/svn/kbuild-mirror/branches/kBuild-0.1.5@2323 1093d150-e988-4e3a-8fd4-90e8b09e91e5 --- kBuild/units/qt4.kmk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kBuild/units/qt4.kmk b/kBuild/units/qt4.kmk index 01a06d4e..bdaffe1c 100644 --- a/kBuild/units/qt4.kmk +++ b/kBuild/units/qt4.kmk @@ -66,7 +66,7 @@ SDK_QT4 = Qt4 # PATH_SDK_QT4_LIB.x86 - The lib directory for X86. # 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. ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) @@ -168,7 +168,7 @@ ifndef PATH_SDK_QT4 # Found it? 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 else @@ -211,7 +211,10 @@ if !defined(PATH_TOOL_QT4_BIN) && defined(PATH_TOOL_QT4) PATH_TOOL_QT4_BIN := $(PATH_TOOL_QT4)/bin 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 TOOL_QT4_BIN_SUFF := $(TOOL_QT4_BIN_SUFF) -- 2.11.4.GIT