Changeset 2729 in kBuild

Timestamp:

Mar 16, 2014 12:21:49 AM (11 years ago)

Author:

bird

Message:

KBUILD_DEVTOOLS fix.

File:

• trunk/kBuild/header.kmk (modified) (3 diffs)

trunk/kBuild/header.kmk

@@ -472 +472 @@
 
 # Development tool tree.
-KBUILD_DEVTOOLS     ?= $(if $(PATH_DEVTOOLS),$(PATH_DEVTOOLS),$(PATH_ROOT)/tools)
+ifndef KBUILD_DEVTOOLS
+ ifeq ($(PATH_DEVTOOLS),)
+  KBUILD_DEVTOOLS    = $(PATH_ROOT)/tools
+ else  
+  KBUILD_DEVTOOLS   := $(PATH_DEVTOOLS)
+ endif 
+endif 
 KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
 KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
@@ -478 +484 @@
 if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64)
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
  else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).hppa32
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).hppa32
  else ifeq ($(KBUILD_TARGET_ARCH),mips64)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).mips32
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).mips32
  else ifeq ($(KBUILD_TARGET_ARCH),ppc64)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).ppc32
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).ppc32
  else ifeq ($(KBUILD_TARGET_ARCH),s390x)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).s390
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).s390
  else ifeq ($(KBUILD_TARGET_ARCH),sparc64)
-  KBUILD_DEVTOOLS_TRG_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).sparc32
+  KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).sparc32
  endif
 endif
@@ -494 +500 @@
 if1of ($(KBUILD_HOST_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64)
  ifeq ($(KBUILD_HOST_ARCH),amd64)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).x86
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).x86
  else ifeq ($(KBUILD_HOST_ARCH),hppa64)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).hppa32
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).hppa32
  else ifeq ($(KBUILD_HOST_ARCH),mips64)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).mips32
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).mips32
  else ifeq ($(KBUILD_HOST_ARCH),ppc64)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).ppc32
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).ppc32
  else ifeq ($(KBUILD_HOST_ARCH),s390x)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).s390
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).s390
  else ifeq ($(KBUILD_HOST_ARCH),sparc64)
-  KBUILD_DEVTOOLS_HST_ALT ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).sparc32
+  KBUILD_DEVTOOLS_HST_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).sparc32
  endif
 endif