Changeset 2750
- Timestamp:
- Jan 23, 2015, 1:24:02 PM (10 years ago)
- Location:
- trunk/kBuild/tools
- Files:
-
- 18 edited
-
ALP.kmk (modified) (1 diff)
-
JWASM.kmk (modified) (1 diff)
-
MASM510.kmk (modified) (1 diff)
-
MASM600.kmk (modified) (1 diff)
-
MASM610.kmk (modified) (1 diff)
-
MASM6PLUS.kmk (modified) (1 diff)
-
MASM710.kmk (modified) (1 diff)
-
MINGW32.kmk (modified) (1 diff)
-
MINGWW64.kmk (modified) (1 diff)
-
NASM.kmk (modified) (1 diff)
-
OPENWATCOM.kmk (modified) (1 diff)
-
TAR.kmk (modified) (1 diff)
-
VAC308.kmk (modified) (1 diff)
-
WATCOMC11C.kmk (modified) (1 diff)
-
WGET.kmk (modified) (1 diff)
-
XGCCAMD64LINUX.kmk (modified) (1 diff)
-
YASM.kmk (modified) (1 diff)
-
ZIP.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/tools/ALP.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef PATH_TOOL_ALP 38 PATH_TOOL_ALP := $(sort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/alp/v*.*))38 PATH_TOOL_ALP := $(sort $(wildcard $(KBUILD_DEVTOOLS_HST)/alp/v*.*)) 39 39 ifneq ($(PATH_TOOL_ALP),) 40 40 PATH_TOOL_ALP := $(call lastword,$(PATH_TOOL_ALP)) -
trunk/kBuild/tools/JWASM.kmk
r2730 r2750 37 37 # Tool Specific Properties 38 38 ifndef TOOL_JWASM_AS 39 TOOL_JWASM_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/jwasm/*/jwasm$(HOSTSUFF_EXE))))39 TOOL_JWASM_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/jwasm/*/jwasm$(HOSTSUFF_EXE)))) 40 40 ifeq ($(TOOL_JWASM_AS),) 41 41 TOOL_JWASM_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/jwasm/*/jwasm$(HOSTSUFF_EXE)))) -
trunk/kBuild/tools/MASM510.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_MASM510_AS 38 TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/masm/v5.10*/masm$(HOSTSUFF_EXE))))38 TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/masm/v5.10*/masm$(HOSTSUFF_EXE)))) 39 39 ifeq ($(TOOL_MASM510_AS),) 40 40 TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/masm/v5.10*/masm$(HOSTSUFF_EXE)))) -
trunk/kBuild/tools/MASM600.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_MASM600_AS 38 TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/masm/v6.00*/binp/ml$(HOSTSUFF_EXE))))38 TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/masm/v6.00*/binp/ml$(HOSTSUFF_EXE)))) 39 39 ifeq ($(TOOL_MASM600_AS),) 40 40 TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/masm/v6.00*/binp/ml$(HOSTSUFF_EXE)))) -
trunk/kBuild/tools/MASM610.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_MASM610_AS 38 TOOL_MASM610_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/masm/v6.10*/binp/ml$(HOSTSUFF_EXE))))38 TOOL_MASM610_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/masm/v6.10*/binp/ml$(HOSTSUFF_EXE)))) 39 39 ifeq ($(TOOL_MASM610_AS),) 40 40 TOOL_MASM610_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/masm/v6.10*/binp/ml$(HOSTSUFF_EXE)))) -
trunk/kBuild/tools/MASM6PLUS.kmk
r2726 r2750 37 37 ifndef TOOL_MASM6PLUS_AS 38 38 TOOL_MASM6PLUS_AS := $(firstword $(rsort $(wildcard \ 39 $(KBUILD_DEVTOOLS_ BLD)/masm/*/bin$(if $(eq $(KBUILD_HOST),os2),p,)/ml$(HOSTSUFF_EXE)\39 $(KBUILD_DEVTOOLS_HST)/masm/*/bin$(if $(eq $(KBUILD_HOST),os2),p,)/ml$(HOSTSUFF_EXE)\ 40 40 ))) 41 41 ifeq ($(TOOL_MASM6PLUS_AS),) 42 42 TOOL_MASM6PLUS_AS := $(firstword $(rsort $(wildcard \ 43 $(KBUILD_DEVTOOLS_ BLD)/vcc/*/bin/ml$(HOSTSUFF_EXE) \43 $(KBUILD_DEVTOOLS_HST)/vcc/*/bin/ml$(HOSTSUFF_EXE) \ 44 44 ))) 45 45 endif -
trunk/kBuild/tools/MASM710.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_MASM710_AS 38 TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/masm/v7.10*/binp/ml$(HOSTSUFF_EXE))))38 TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/masm/v7.10*/binp/ml$(HOSTSUFF_EXE)))) 39 39 ifeq ($(TOOL_MASM710_AS),) 40 40 TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/masm/v7.10*/binp/ml$(HOSTSUFF_EXE)))) -
trunk/kBuild/tools/MINGW32.kmk
r2726 r2750 39 39 # Tool Specific Properties 40 40 ifndef PATH_TOOL_MINGW32 41 PATH_TOOL_MINGW32 := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/mingw32/v*.*)41 PATH_TOOL_MINGW32 := $(wildcard $(KBUILD_DEVTOOLS_HST)/mingw32/v*.*) 42 42 ifeq ($(PATH_TOOL_MINGW32),) 43 43 PATH_TOOL_MINGW32 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/mingw32/v*.*) -
trunk/kBuild/tools/MINGWW64.kmk
r2726 r2750 39 39 # Tool Specific Properties 40 40 ifndef PATH_TOOL_MINGWW64 41 PATH_TOOL_MINGWW64 := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/mingw-w64/r*)41 PATH_TOOL_MINGWW64 := $(wildcard $(KBUILD_DEVTOOLS_HST)/mingw-w64/r*) 42 42 ifeq ($(PATH_TOOL_MINGWW64),) 43 43 PATH_TOOL_MINGWW64 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/mingw-w64/r*) -
trunk/kBuild/tools/NASM.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef PATH_TOOL_NASM 38 PATH_TOOL_NASM := $(sort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/nasm/v*.*))38 PATH_TOOL_NASM := $(sort $(wildcard $(KBUILD_DEVTOOLS_HST)/nasm/v*.*)) 39 39 ifneq ($(PATH_TOOL_NASM),) 40 40 PATH_TOOL_NASM := $(call lastword,$(PATH_TOOL_NASM)) -
trunk/kBuild/tools/OPENWATCOM.kmk
r2749 r2750 36 36 ifeq ($(PATH_TOOL_OPENWATCOM),) 37 37 ifeq ($(PATH_TOOL_OPENWATCOM),) 38 PATH_TOOL_OPENWATCOM := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/openwatcom/v*)38 PATH_TOOL_OPENWATCOM := $(wildcard $(KBUILD_DEVTOOLS_HST)/openwatcom/v*) 39 39 endif 40 40 ifeq ($(PATH_TOOL_OPENWATCOM),) -
trunk/kBuild/tools/TAR.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_TAR_TAR 38 TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/tar/v*/tar$(HOSTSUFF_EXE))38 TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_HST)/tar/v*/tar$(HOSTSUFF_EXE)) 39 39 ifeq ($(TOOL_TAR_TAR),) 40 TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/bin/tar$(HOSTSUFF_EXE))40 TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/tar$(HOSTSUFF_EXE)) 41 41 endif 42 42 ifneq ($(TOOL_TAR_TAR),) -
trunk/kBuild/tools/VAC308.kmk
r2726 r2750 36 36 # Determin VAC308 location. 37 37 ifndef PATH_TOOL_VAC308 38 PATH_TOOL_VAC308 := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/vac/v3.0.8*)38 PATH_TOOL_VAC308 := $(wildcard $(KBUILD_DEVTOOLS_HST)/vac/v3.0.8*) 39 39 ifeq ($(PATH_TOOL_VAC308),) 40 PATH_TOOL_VAC308 := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/vac/v308*)40 PATH_TOOL_VAC308 := $(wildcard $(KBUILD_DEVTOOLS_HST)/vac/v308*) 41 41 endif 42 42 ifeq ($(PATH_TOOL_VAC308),) -
trunk/kBuild/tools/WATCOMC11C.kmk
r2749 r2750 36 36 ifeq ($(PATH_TOOL_WATCOMC11C),) 37 37 ifeq ($(PATH_TOOL_WATCOMC11C),) 38 PATH_TOOL_WATCOMC11C := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/watcom/v11.0c*)38 PATH_TOOL_WATCOMC11C := $(wildcard $(KBUILD_DEVTOOLS_HST)/watcom/v11.0c*) 39 39 endif 40 40 ifeq ($(PATH_TOOL_WATCOMC11C),) -
trunk/kBuild/tools/WGET.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_WGET_FETCH 38 TOOL_WGET_FETCH := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/wget/v*/wget$(HOSTSUFF_EXE))38 TOOL_WGET_FETCH := $(wildcard $(KBUILD_DEVTOOLS_HST)/wget/v*/wget$(HOSTSUFF_EXE)) 39 39 ifneq ($(TOOL_WGET_FETCH),) 40 TOOL_WGET_FETCH := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/bin/wget$(HOSTSUFF_EXE))40 TOOL_WGET_FETCH := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/wget$(HOSTSUFF_EXE)) 41 41 endif 42 42 ifneq ($(TOOL_WGET_FETCH),) -
trunk/kBuild/tools/XGCCAMD64LINUX.kmk
r2726 r2750 44 44 TOOL_XGCCAMD64LINUX_PREFIX := x86_64-unknown-linux-gnu- 45 45 ifndef PATH_TOOL_XGCCAMD64LINUX 46 PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/x86_64-unknown-linux-gnu/*))46 PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(KBUILD_DEVTOOLS_HST)/x86_64-unknown-linux-gnu/*)) 47 47 ifeq ($(PATH_TOOL_XGCCAMD64LINUX),) 48 48 ifeq ($(filter-out win.amd64,$(KBUILD_HOST).$(KBUILD_HOST_ARCH)),) # these can use the windows build. -
trunk/kBuild/tools/YASM.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef PATH_TOOL_YASM 38 PATH_TOOL_YASM := $(sort $(wildcard $(KBUILD_DEVTOOLS_ BLD)/yasm/v*.*))38 PATH_TOOL_YASM := $(sort $(wildcard $(KBUILD_DEVTOOLS_HST)/yasm/v*.*)) 39 39 ifneq ($(PATH_TOOL_YASM),) 40 40 PATH_TOOL_YASM := $(call lastword,$(PATH_TOOL_YASM)) -
trunk/kBuild/tools/ZIP.kmk
r2726 r2750 36 36 # Tool Specific Properties 37 37 ifndef TOOL_ZIP_UNPACK 38 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/unzip/v*/unzip$(HOSTSUFF_EXE))38 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/unzip/v*/unzip$(HOSTSUFF_EXE)) 39 39 ifeq ($(TOOL_ZIP_UNPACK),) 40 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/zip/v*/unzip$(HOSTSUFF_EXE))40 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/zip/v*/unzip$(HOSTSUFF_EXE)) 41 41 endif 42 42 ifeq ($(TOOL_ZIP_UNPACK),) 43 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/bin/unzip$(HOSTSUFF_EXE))43 TOOL_ZIP_UNPACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/unzip$(HOSTSUFF_EXE)) 44 44 endif 45 45 ifneq ($(TOOL_ZIP_UNPACK),) … … 52 52 endif 53 53 #ifndef TOOL_ZIP_PACK 54 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/zip/v*/zip$(HOSTSUFF_EXE))54 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/zip/v*/zip$(HOSTSUFF_EXE)) 55 55 # ifeq ($(TOOL_ZIP_PACK),) 56 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/unzip/v*/zip$(HOSTSUFF_EXE))56 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/unzip/v*/zip$(HOSTSUFF_EXE)) 57 57 # endif 58 58 # ifeq ($(TOOL_ZIP_PACK),) 59 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_ BLD)/bin/zip$(HOSTSUFF_EXE))59 # TOOL_ZIP_PACK := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/zip$(HOSTSUFF_EXE)) 60 60 # endif 61 61 # ifneq ($(TOOL_ZIP_PACK),)
Note:
See TracChangeset
for help on using the changeset viewer.
