X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=EmulatorPkg%2Fbuild.sh;h=7f7439112044a85a8a35da19dd1fa35f076e4b6b;hb=9b6bbcdbfdf5e54c6d1ed538ea8076d0858fb164;hp=fc8ae493cd493e42e746a1bd902dd0029c67dd44;hpb=dc4ad1532e59fd1a185d6b90d1c2a92cf8713f40;p=mirror_edk2.git
diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
index fc8ae493cd..7f74391120 100755
--- a/EmulatorPkg/build.sh
+++ b/EmulatorPkg/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -63,8 +63,17 @@ case `uname` in
echo UnixPkg requires Snow Leopard or later OS
exit 1
else
- HOST_TOOLS=XCODE32
- TARGET_TOOLS=XCLANG
+ CLANG_VER=$(clang -ccc-host-triple x86_64-pc-win32-macho 2>&1 >/dev/null) || true
+ if [[ "$CLANG_VER" == *-ccc-host-triple* ]]
+ then
+ # only older versions of Xcode support -ccc-host-tripe, for newer versions
+ # it is -target
+ HOST_TOOLS=XCODE32
+ TARGET_TOOLS=XCODE5
+ else
+ HOST_TOOLS=XCODE32
+ TARGET_TOOLS=XCLANG
+ fi
fi
BUILD_NEW_SHELL="-D BUILD_NEW_SHELL"
BUILD_FAT="-D BUILD_FAT"
@@ -96,7 +105,7 @@ case `uname` in
4.8.*)
TARGET_TOOLS=GCC48
;;
- 4.9.*|4.1[0-9].*)
+ 4.9.*|4.1[0-9].*|5.*.*)
TARGET_TOOLS=GCC49
;;
*)
@@ -190,7 +199,8 @@ do
done
PLATFORMFILE=$WORKSPACE/EmulatorPkg/EmulatorPkg.dsc
-BUILD_ROOT_ARCH=$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
+BUILD_DIR=$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"
+BUILD_ROOT_ARCH=$BUILD_DIR/$PROCESSOR
if [[ ! -f `which build` || ! -f `which GenFv` ]];
then
@@ -215,7 +225,16 @@ if [[ "$RUN_EMULATOR" == "yes" ]]; then
# This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE
# images that get loaded in Host
#
- cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
+ if [[ "$CLANG_VER" == *-ccc-host-triple* ]]
+ then
+ # only older versions of Xcode support -ccc-host-tripe, for newer versions
+ # it is -target
+ cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
+ cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source $WORKSPACE/EmulatorPkg/Unix/lldbinit Host
+ exit $?
+ else
+ cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
+ fi
;;
esac