From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: jordan.l.justen@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Sat, 13 Jul 2019 00:41:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jul 2019 00:41:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,485,1557212400"; d="scan'208";a="365836010" Received: from abaradwa-mobl.amr.corp.intel.com (HELO localhost) ([10.254.104.4]) by fmsmga006.fm.intel.com with ESMTP; 13 Jul 2019 00:41:47 -0700 MIME-Version: 1.0 In-Reply-To: <20190410090734.19835-1-jordan.l.justen@intel.com> References: <20190410090734.19835-1-jordan.l.justen@intel.com> From: "Jordan Justen" Subject: Re: [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter To: devel@edk2.groups.io, Andrew Fish , Ray Ni Message-ID: <156300370674.5689.6433150749740005539@jljusten-skl> User-Agent: alot/0.8 Date: Sat, 13 Jul 2019 00:41:46 -0700 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2019-04-10 02:07:34, Jordan Justen wrote: > Signed-off-by: Jordan Justen > Cc: Andrew Fish > Cc: Ray Ni ping > --- > EmulatorPkg/build.sh | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh > index 89fd26baca..75561c116a 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 - 2015, Intel Corporation. All rights reserved.
> +# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -188,7 +188,7 @@ do > done > =20 > PLATFORMFILE=3D$WORKSPACE/EmulatorPkg/EmulatorPkg.dsc > -BUILD_DIR=3D$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS" > +BUILD_DIR=3D"$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS" > BUILD_ROOT_ARCH=3D$BUILD_DIR/$PROCESSOR > =20 > if [[ ! -f `which build` || ! -f `which GenFv` ]]; > @@ -218,11 +218,11 @@ if [[ "$RUN_EMULATOR" =3D=3D "yes" ]]; then > 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/DEBU= G_"$TARGET_TOOLS"/$PROCESSOR > + cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py "$BUILD_OUTPUT_DIR/${B= UILDTARGET}_$TARGET_TOOLS/$PROCESSOR" > cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source $WORKSPACE/EmulatorP= kg/Unix/lldbinit Host > exit $?=20 > else > - cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $BUILD_OUTPUT_DIR/DEBUG_= "$TARGET_TOOLS"/$PROCESSOR > + cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit "$BUILD_OUTPUT_DIR/${BUI= LDTARGET}_$TARGET_TOOLS/$PROCESSOR" > fi > ;; > esac > @@ -255,7 +255,7 @@ if [[ $HOST_TOOLS =3D=3D $TARGET_TOOLS ]]; then > else > build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a $PRO= CESSOR -b $BUILDTARGET -t $HOST_TOOLS -D BUILD_$ARCH_SIZE -D UNIX_SEC_BUIL= D -D SKIP_MAIN_BUILD -n 3 modules > build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a $PRO= CESSOR -b $BUILDTARGET -t $TARGET_TOOLS -D BUILD_$ARCH_SIZE $NETWORK_SUPPOR= T $BUILD_NEW_SHELL $BUILD_FAT -n 3 > - cp $BUILD_OUTPUT_DIR/DEBUG_"$HOST_TOOLS"/$PROCESSOR/Host $BUILD_ROOT_A= RCH > + cp "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$HOST_TOOLS/$PROCESSOR/Host" $BUI= LD_ROOT_ARCH > fi > exit $? > =20 > --=20 > 2.20.1 >=20