Changeset 3334 for trunk/kBuild/tools

Timestamp:

Apr 21, 2020, 2:19:55 AM (5 years ago)

Author:

bird

Message:

tools/VCC141.kmk: Changed my mind about the tools/win.x86/vcc/*/ layout, we'll just copy the installed one and avoid any unnecessary differences.

File:

• trunk/kBuild/tools/VCC141.kmk (modified) (3 diffs)

trunk/kBuild/tools/VCC141.kmk

@@ -42 +42 @@
 #
 ifndef PATH_TOOL_VCC141
- PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v141*)))
+ PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v14.1*/Tools/MSVC/14.1?.*)))
  ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v141*)))
+  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.1*/Tools/MSVC/14.1?.*)))
  endif
  ifeq ($(PATH_TOOL_VCC141),)
@@ -53 +53 @@
  endif
  ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v141*)))
+  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.1*/Tools/MSVC/14.1?.*)))
   ifeq ($(PATH_TOOL_VCC141),)
    PATH_TOOL_VCC141 := $(firstfile $(foreach ver,2017 2019,$(foreachfile progfilesdir,$(WINCMN_PROGRAM_FILES_LIST)\
@@ -162 +162 @@
 PATH_TOOL_VCC141_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC141)), 1, -12)/Redist/MSVC/14.1*))
 else
-PATH_TOOL_VCC141_REDIST ?= $(PATH_TOOL_VCC141)/Redist
+PATH_TOOL_VCC141_REDIST ?= $(qabspath ,$(firstfile $(qwildcard ,\
+        $(PATH_TOOL_VCC141)/Redist \
+        $(PATH_TOOL_VCC141)/../Redist \
+        $(PATH_TOOL_VCC141)/../../Redist \
+        $(PATH_TOOL_VCC141)/../../../Redist \
+        $(PATH_TOOL_VCC141)/../../../../Redist)))
 endif
 PATH_TOOL_VCC141_REDIST_DEBUG ?= $(PATH_TOOL_VCC141_REDIST)/debug_nonredist