fixed paths for UNIXGCC tools

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4489 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index befe46c93cbe6e3c549f11b094a6fd536dd3cd47..14925c2f5741362cbf154304c650cfbfd0c3973b 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -48,8 +48,8 @@ DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin
 DEFINE ELFGCC_BIN    = /usr/bin\r
 \r
 # Option 1: Hard coded full path to compiler suite\r
-#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/\r
-#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
 # Option 2: Use an environment variable\r
 #DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)\r
 #DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(X64_PETOOLS_PREFIX)\r
@@ -58,8 +58,8 @@ DEFINE ELFGCC_BIN    = /usr/bin
 #DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = x86_64-pc-mingw32-\r
 # Option 4: Create links under the Conf directory\r
 # Links needed: gcc, ar & ld\r
-DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(WORKSPACE)/Conf/gcc/ia32/\r
-DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(WORKSPACE)/Conf/gcc/x64/\r
+DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(WORKSPACE)/Conf/gcc/ia32\r
+DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(WORKSPACE)/Conf/gcc/x64\r
 \r
 DEFINE CYGWIN_BIN    = c:/cygwin/bin\r
 DEFINE CYGWIN_BIN32  = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
@@ -415,24 +415,24 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_UNIXGCC_IA32_CC_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_IA32_SLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ar\r
-*_UNIXGCC_IA32_DLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ld\r
-*_UNIXGCC_IA32_ASM_PATH             = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_IA32_PP_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_IA32_VFRPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_CC_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_SLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ar\r
+*_UNIXGCC_IA32_DLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ld\r
+*_UNIXGCC_IA32_ASM_PATH             = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_PP_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_VFRPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
 \r
 *_UNIXGCC_IA32_CC_FLAGS                  = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
 \r
 ##################\r
 # X64 definitions\r
 ##################\r
-*_UNIXGCC_X64_CC_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_X64_SLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ar\r
-*_UNIXGCC_X64_DLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ld\r
-*_UNIXGCC_X64_ASM_PATH              = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_X64_PP_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
-*_UNIXGCC_X64_VFRPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_CC_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_SLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ar\r
+*_UNIXGCC_X64_DLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ld\r
+*_UNIXGCC_X64_ASM_PATH              = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_PP_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_VFRPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
 \r
 *_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -Wno-array-bounds -c -include AutoGen.h -D_EFI_P64\r
 \r