Changeset 2974 in kBuild

Timestamp:

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

Author:

bird

Message:

qt5.kmk: duh.

File:

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

trunk/kBuild/units/qt5.kmk

@@ -116 +116 @@
      ifeq ($(PATH_SDK_QT5_INC),)
       PATH_SDK_QT5_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_TARGET_DOT_ARCH),/usr/include/$(type)/qt5/QtCore/qglobal.h) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/include/$(type)/qt5/QtCore/qglobal.h) \
         $(PATH_SDK_QT5)/include/qt5/QtCore/qglobal.h \
         /usr/include/qt5/QtCore/qtglobal.h \
@@ -177 +177 @@
         /usr/lib/libQt5Core$(SUFF_DLL) \
         /usr/lib/qt5/libQt5Core$(SUFF_DLL) \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_TARGET_DOT_ARCH),/usr/lib/$(type)/libQt5Core$(SUFF_DLL)) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         /usr/local/lib/libQt5Core$(SUFF_DLL) \
         /usr/local/lib/qt5/libQt5Core$(SUFF_DLL) \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_TARGET_DOT_ARCH),/usr/local/lib/$(type)/libQt5Core$(SUFF_DLL)) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/local/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         )))
       endif
@@ -248 +248 @@
   ifneq ($(TOOL_QT5_BIN_SUFF),)
    PATH_TOOL_QT5_BIN := $(patsubst %/moc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
-         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/moc$(TOOL_QT5_BIN_SUFF)) \
+         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/moc$(TOOL_QT5_BIN_SUFF)) \
          /usr/lib/qt5/bin/moc$(TOOL_QT5_BIN_SUFF) \
          /usr/qt/5/bin/moc$(TOOL_QT5_BIN_SUFF) \
@@ -257 +257 @@
   else
    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) \
+        $(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 \
         /usr/qt/5/bin/moc-qt5 \
@@ -269 +269 @@
     # 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) \
+        $(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 \
@@ -279 +279 @@
   ifeq ($(PATH_TOOL_QT5_BIN),)
    PATH_TOOL_QT5_BIN := $(patsubst %/qt4to5,%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/qt4to5) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/qt4to5) \
         /usr/lib/qt5/bin/qt4to5 \
         /usr/qt/5/bin/qt4to5 \
@@ -289 +289 @@
   ifeq ($(PATH_TOOL_QT5_BIN),)
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF)) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF)) \
         /usr/lib/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
         /usr/qt/5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
@@ -299 +299 @@
   if "$(PATH_TOOL_QT5_BIN)" == "" && "$(TOOL_QT5_BIN_SUFF)" != ""
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc,%,$(firstword $(wildcard \
-        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/rcc) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt5/bin/rcc) \
         /usr/lib/qt5/bin/rcc \
         /usr/qt/5/bin/rcc \