From 8c84e1b1aca1f2eac14ba331f3fec892210a70c4 Mon Sep 17 00:00:00 2001 From: jwang36 Date: Fri, 13 Oct 2006 09:21:14 +0000 Subject: a) Cleaned tools_def.template b) Changed overriding priority of tool chain definition. Now right non-* has higher priority. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1744 6f19259b-4bc3-4df7-8a09-765794883524 --- Tools/Conf/tools_def.template | 88 +++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 49 deletions(-) (limited to 'Tools/Conf/tools_def.template') diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template index 6cb197fb7d..f36bcf21fa 100644 --- a/Tools/Conf/tools_def.template +++ b/Tools/Conf/tools_def.template @@ -15,6 +15,23 @@ IDENTIFIER = Default TOOL_CHAIN_CONF #################################################################################### # # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = +# priorty: +# TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE (Highest) +# ******_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE +# TARGET_*********_ARCH_COMMANDTYPE_ATTRIBUTE +# ******_*********_ARCH_COMMANDTYPE_ATTRIBUTE +# TARGET_TOOLCHAIN_****_COMMANDTYPE_ATTRIBUTE +# ******_TOOLCHAIN_****_COMMANDTYPE_ATTRIBUTE +# TARGET_*********_****_COMMANDTYPE_ATTRIBUTE +# ******_*********_****_COMMANDTYPE_ATTRIBUTE +# TARGET_TOOLCHAIN_ARCH_***********_ATTRIBUTE +# ******_TOOLCHAIN_ARCH_***********_ATTRIBUTE +# TARGET_*********_ARCH_***********_ATTRIBUTE +# ******_*********_ARCH_***********_ATTRIBUTE +# TARGET_TOOLCHAIN_****_***********_ATTRIBUTE +# ******_TOOLCHAIN_****_***********_ATTRIBUTE +# TARGET_*********_****_***********_ATTRIBUTE +# ******_*********_****_***********_ATTRIBUTE (Lowest) # #################################################################################### #################################################################################### @@ -124,10 +141,12 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP ################## # IPF definitions ################## +*_WINDDK3790x1830_IPF_APP_NAME = cl.exe *_WINDDK3790x1830_IPF_ASM_NAME = ias.exe *_WINDDK3790x1830_IPF_ASM_EXT = .s *_WINDDK3790x1830_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86 +*_WINDDK3790x1830_IPF_APP_FLAGS = /nologo /P /TC *_WINDDK3790x1830_IPF_PP_FLAGS = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h *_WINDDK3790x1830_IPF_CC_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h *_WINDDK3790x1830_IPF_PCH_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC @@ -155,10 +174,7 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP ################## *_WINDDK3790x1830_*_ASL_FAMILY = INTEL *_WINDDK3790x1830_*_ASL_NAME = iasl.exe -*_WINDDK3790x1830_IA32_ASL_PATH = C:\ASL -*_WINDDK3790x1830_X64_ASL_PATH = C:\ASL -*_WINDDK3790x1830_IPF_ASL_PATH = C:\ASL -*_WINDDK3790x1830_EBC_ASL_PATH = C:\ASL +*_WINDDK3790x1830_*_ASL_PATH = C:\ASL #################################################################################### # @@ -248,10 +264,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF ################## *_VS2005PRO_*_ASL_FAMILY = INTEL *_VS2005PRO_*_ASL_NAME = iasl.exe -*_VS2005PRO_IA32_ASL_PATH = C:\ASL -*_VS2005PRO_X64_ASL_PATH = C:\ASL -*_VS2005PRO_IPF_ASL_PATH = C:\ASL -*_VS2005PRO_EBC_ASL_PATH = C:\ASL +*_VS2005PRO_*_ASL_PATH = C:\ASL #################################################################################### # @@ -330,10 +343,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF # # *_*_*_ASL_FAMILY = INTEL # *_*_*_ASL_NAME = iasl.exe -# *_*_IA32_ASL_PATH = C:\ASL -# *_*_X64_ASL_PATH = C:\ASL -# *_*_IPF_ASL_PATH = C:\ASL -# *_*_EBC_ASL_PATH = C:\ASL +# *_*_*_ASL_PATH = C:\ASL # #################################################################################### # @@ -343,10 +353,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF # # *_*_*_ASL_FAMILY = MSFT # *_*_*_ASL_NAME = asl.exe -# *_*_IA32_ASL_PATH = C:\ASL -# *_*_X64_ASL_PATH = C:\ASL -# *_*_IPF_ASL_PATH = C:\ASL -# *_*_EBC_ASL_PATH = C:\ASL +# *_*_*_ASL_PATH = C:\ASL # #################################################################################### @@ -359,20 +366,20 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF # ASL - Intel ACPI Source Language COmpiler # #################################################################################### +*_MYTOOLS_*_*_FAMILY = MSFT + +*_MYTOOLS_*_CC_NAME = cl.exe +*_MYTOOLS_*_SLINK_NAME = lib.exe +*_MYTOOLS_*_DLINK_NAME = link.exe +*_MYTOOLS_*_ASMLINK_NAME = link.exe +*_MYTOOLS_*_PP_NAME = cl.exe +*_MYTOOLS_*_ASM_NAME = ml.exe ################## # IA32 definitions ################## -*_MYTOOLS_IA32_*_FAMILY = MSFT - -*_MYTOOLS_IA32_CC_NAME = cl.exe -*_MYTOOLS_IA32_SLINK_NAME = lib.exe -*_MYTOOLS_IA32_DLINK_NAME = link.exe -*_MYTOOLS_IA32_ASMLINK_NAME = link.exe -*_MYTOOLS_IA32_PP_NAME = cl.exe -*_MYTOOLS_IA32_ASM_NAME = ml.exe -*_MYTOOLS_IA32_ASM_EXT = .asm *_MYTOOLS_IA32_PCH_NAME = cl.exe +*_MYTOOLS_IA32_ASM_EXT = .asm *_MYTOOLS_IA32_*_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin *_MYTOOLS_IA32_*_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE @@ -392,22 +399,14 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF / ################## # x64 definitions ################## -*_MYTOOLS_X64_*_FAMILY = MSFT - -*_MYTOOLS_X64_CC_NAME = cl.exe -*_MYTOOLS_X64_SLINK_NAME = lib.exe -*_MYTOOLS_X64_DLINK_NAME = link.exe -*_MYTOOLS_X64_ASMLINK_NAME = link.exe -*_MYTOOLS_X64_PP_NAME = cl.exe *_MYTOOLS_X64_PCH_NAME = cl.exe - -*_MYTOOLS_X64_SLINK_FLAGS = /nologo /LTCG - *_MYTOOLS_X64_ASM_NAME = ml64.exe *_MYTOOLS_X64_ASM_EXT = .asm + *_MYTOOLS_X64_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86\amd64 *_MYTOOLS_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\bin\bin16\ +*_MYTOOLS_X64_SLINK_FLAGS = /nologo /LTCG *_MYTOOLS_X64_PP_FLAGS = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h DEBUG_MYTOOLS_X64_CC_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DOLDSMM=1 /D EFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm /EHs-c- /GF RELEASE_MYTOOLS_X64_CC_FLAGS = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /D EFIX64 /DOLDSMM=1 /D EFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF @@ -421,19 +420,11 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O ################## # IPF definitions ################## -*_MYTOOLS_IPF_*_FAMILY = MSFT - -*_MYTOOLS_IPF_APP_NAME = cl.exe -*_MYTOOLS_IPF_PP_NAME = cl.exe -*_MYTOOLS_IPF_CC_NAME = cl.exe -*_MYTOOLS_IPF_SLINK_NAME = lib.exe -*_MYTOOLS_IPF_DLINK_NAME = link.exe *_MYTOOLS_IPF_PCH_NAME = cl.exe - -*_MYTOOLS_IPF_SLINK_FLAGS = /nologo /LTCG - +*_MYTOOLS_IPF_APP_NAME = cl.exe *_MYTOOLS_IPF_ASM_NAME = ias.exe *_MYTOOLS_IPF_ASM_EXT = .s + *_MYTOOLS_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86 *_MYTOOLS_IPF_APP_FLAGS = /nologo /P /TC @@ -442,6 +433,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O *_MYTOOLS_IPF_PCH_FLAGS = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC *_MYTOOLS_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 *_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /OPT:REF /IGNORE:4086 /MAP /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb +*_MYTOOLS_IPF_SLINK_FLAGS = /nologo /LTCG ################## # EBC definitions @@ -451,6 +443,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O *_MYTOOLS_EBC_CC_NAME = iec.exe *_MYTOOLS_EBC_DLINK_NAME = link.exe *_MYTOOLS_EBC_SLINK_NAME = link.exe + *_MYTOOLS_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin *_MYTOOLS_EBC_*_SPATH = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" @@ -464,7 +457,4 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O ################## *_MYTOOLS_*_ASL_FAMILY = INTEL *_MYTOOLS_*_ASL_NAME = iasl.exe -*_MYTOOLS_IA32_ASL_PATH = C:\ASL -*_MYTOOLS_X64_ASL_PATH = C:\ASL -*_MYTOOLS_IPF_ASL_PATH = C:\ASL -*_MYTOOLS_EBC_ASL_PATH = C:\ASL +*_MYTOOLS_*_ASL_PATH = C:\ASL -- cgit v1.2.3