X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=EmulatorPkg%2Fbuild.sh;h=2daaaadcd4217b05a21dbc60ff734107e016e3ab;hb=f747640bf333801062b3b8837e7cfcda75ad6215;hp=339c6b3b4fc5816974d981b4204db30088e36747;hpb=a04ec6d9f70f7eedf5ab49b098970245270fa594;p=mirror_edk2.git diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 339c6b3b4f..2daaaadcd4 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -48,7 +48,7 @@ PLATFORMFILE= LAST_ARG= RUN_EMULATOR=no CLEAN_TYPE=none -TARGET_TOOLS=GCC44 +TARGET_TOOLS=GCC48 NETWORK_SUPPORT= BUILD_NEW_SHELL= BUILD_FAT= @@ -93,22 +93,10 @@ case `uname` in gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in - [1-3].*|4.[0-3].*) - echo EmulatorPkg requires GCC4.4 or later + [1-3].*|4.[0-7].*) + echo EmulatorPkg requires GCC4.8 or later exit 1 ;; - 4.4.*) - TARGET_TOOLS=GCC44 - ;; - 4.5.*) - TARGET_TOOLS=GCC45 - ;; - 4.6.*) - TARGET_TOOLS=GCC46 - ;; - 4.7.*) - TARGET_TOOLS=GCC47 - ;; 4.8.*) TARGET_TOOLS=GCC48 ;; @@ -179,16 +167,16 @@ then PROCESSOR=$HOST_PROCESSOR fi +BUILD_OUTPUT_DIR=$WORKSPACE/Build/Emulator$PROCESSOR + case $PROCESSOR in IA32) ARCH_SIZE=32 - BUILD_OUTPUT_DIR=$WORKSPACE/Build/Emulator32 LIB_NAMES="ld-linux.so.2 libdl.so.2 crt1.o crti.o crtn.o" LIB_SEARCH_PATHS="/usr/lib/i386-linux-gnu /usr/lib32 /lib32 /usr/lib /lib" ;; X64) ARCH_SIZE=64 - BUILD_OUTPUT_DIR=$WORKSPACE/Build/Emulator LIB_NAMES="ld-linux-x86-64.so.2 libdl.so.2 crt1.o crti.o crtn.o" LIB_SEARCH_PATHS="/usr/lib/x86_64-linux-gnu /usr/lib64 /lib64 /usr/lib /lib" ;;