BaseTools/Conf/tools_def.template:

  Changes for UNIXGCC toolchain.
  Tested on OS X with x86_64-pc-mingw32 bintools/gcc

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b099e0ee6d21352b220a69967b850b22a0f98563..da6bcabf4883fe9ce41234c168e34fe3cad4a857 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -47,8 +47,19 @@ DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin
 \r
 DEFINE ELFGCC_BIN    = /usr/bin\r
 \r
-DEFINE PEGCC_BIN32   = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-DEFINE PEGCC_BINX64  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\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
+# 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
+# Option 3: Install the compiler suite into your default paths\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = i386-pc-mingw32-\r
+#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
 \r
 DEFINE CYGWIN_BIN    = c:/cygwin/bin\r
 DEFINE CYGWIN_BIN32  = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
@@ -399,30 +410,31 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_UNIXGCC_*_ASM_FLAGS                    = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
+*_UNIXGCC_*_MAKE_PATH                    = make\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_UNIXGCC_IA32_CC_PATH              = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_SLINK_PATH           = DEF(PEGCC_BIN32)/ar\r
-*_UNIXGCC_IA32_DLINK_PATH           = DEF(PEGCC_BIN32)/ld\r
-*_UNIXGCC_IA32_ASM_PATH             = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_PP_PATH              = DEF(PEGCC_BIN32)/gcc\r
-*_UNIXGCC_IA32_VFRPP_PATH           = DEF(PEGCC_BIN32)/cc\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(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_SLINK_PATH            = DEF(PEGCC_BINX64)/ar\r
-*_UNIXGCC_X64_DLINK_PATH            = DEF(PEGCC_BINX64)/ld\r
-*_UNIXGCC_X64_ASM_PATH              = DEF(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_PP_PATH               = DEF(PEGCC_BINX64)/gcc\r
-*_UNIXGCC_X64_VFRPP_PATH            = DEF(PEGCC_BINX64)/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 -c -include AutoGen.h -D_EFI_P64\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
 ####################################################################################\r
 #\r