mirror of
https://github.com/tianocore/edk2
synced 2026-08-27 00:23:19 -04:00
EmulatorPkg: Remove references to GCC5 in scripts and tools
Note the GCC tool chain tag is currently intended to be compatible with gcc releases 8 and higher. Signed-off-by: Mike Beaton <mjsbeaton@gmail.com>
This commit is contained in:
parent
f11bcd3390
commit
dd69f7302a
4 changed files with 11 additions and 18 deletions
|
|
@ -554,8 +554,7 @@
|
|||
#
|
||||
# +--------------------+--------+----------+------------+-----+----+--------+
|
||||
# | OS/Compiler | VS2019 | CLANGPDB | CLANGDWARF | GCC | XCODE5 |
|
||||
# | | VS2022 | | | GCC5 | |
|
||||
# | | | | | GCCNOLTO | |
|
||||
# | | VS2022 | | | GCCNOLTO | |
|
||||
# +--------------------+--------+----------+------------+----------+--------+
|
||||
# | Windows/VS |IA32/X64| | | | |
|
||||
# | Windows/LLVM/VS | | IA32/X64 | | | |
|
||||
|
|
@ -602,12 +601,12 @@
|
|||
!if $(TOOL_CHAIN_TAG) in "CLANGPDB"
|
||||
!error EmulatorPkg not supported for Mingw/CLANGPDB builds
|
||||
!endif
|
||||
!if $(TOOL_CHAIN_TAG) in "GCC GCC5 GCCNOLTO"
|
||||
!if $(TOOL_CHAIN_TAG) in "GCC GCCNOLTO"
|
||||
!error EmulatorPkg not supported for Mingw/GCC builds
|
||||
!endif
|
||||
!else
|
||||
!if $(WIN_HOST_BUILD)
|
||||
!if $(TOOL_CHAIN_TAG) in "GCC GCC5 GCCNOLTO"
|
||||
!if $(TOOL_CHAIN_TAG) in "GCC GCCNOLTO"
|
||||
!error EmulatorPkg not supported for Windows/GCC builds
|
||||
!endif
|
||||
!if $(TOOL_CHAIN_TAG) in "CLANGDWARF"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ to use the same Pytools based build infrastructure locally.
|
|||
## Supported Configuration Details
|
||||
|
||||
This solution for building and running EmulatorPkg has only been validated with Windows 10
|
||||
with VS2022 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware builds are
|
||||
with VS2022 and Ubuntu 18.04 with GCC toolchain. Four different firmware builds are
|
||||
supported and are described below.
|
||||
|
||||
| Configuration name | Architectures | DSC File |Additional Flags |
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
|
|||
|
||||
* 32bit emulator in Linux:
|
||||
|
||||
`build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32`
|
||||
`build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a IA32`
|
||||
|
||||
* 64bit emulator in Linux:
|
||||
|
||||
`build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64`
|
||||
`build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a X64`
|
||||
|
||||
**You can start/run the emulator using the following command:**
|
||||
* 32bit emulator in Windows:
|
||||
|
|
@ -46,11 +46,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
|
|||
|
||||
* 32bit emulator in Linux:
|
||||
|
||||
`cd Build/EmulatorIA32/DEBUG_GCC5/IA32/ && ./Host`
|
||||
`cd Build/EmulatorIA32/DEBUG_GCC/IA32/ && ./Host`
|
||||
|
||||
* 64bit emulator in Linux:
|
||||
|
||||
`cd Build/EmulatorX64/DEBUG_GCC5/X64/ && ./Host`
|
||||
`cd Build/EmulatorX64/DEBUG_GCC/X64/ && ./Host`
|
||||
|
||||
**On posix-like environment with the bash shell you can use EmulatorPkg/build.sh to simplify building and running
|
||||
emulator.**
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ PLATFORMFILE=
|
|||
LAST_ARG=
|
||||
RUN_EMULATOR=no
|
||||
CLEAN_TYPE=none
|
||||
TARGET_TOOLS=GCC48
|
||||
TARGET_TOOLS=GCC
|
||||
NETWORK_SUPPORT=-D NETWORK_ENABLE=FALSE
|
||||
BUILD_NEW_SHELL=
|
||||
BUILD_FAT=
|
||||
|
|
@ -87,16 +87,10 @@ case `uname` in
|
|||
|
||||
gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
|
||||
case $gcc_version in
|
||||
[1-3].*|4.[0-7].*)
|
||||
echo EmulatorPkg requires GCC4.8 or later
|
||||
[1-7].*)
|
||||
echo EmulatorPkg requires GCC8 or later
|
||||
exit 1
|
||||
;;
|
||||
4.8.*)
|
||||
TARGET_TOOLS=GCC48
|
||||
;;
|
||||
4.9.*|6.[0-2].*)
|
||||
TARGET_TOOLS=GCC49
|
||||
;;
|
||||
*)
|
||||
TARGET_TOOLS=GCC
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue