Fixes: f89c018f3d "EmulatorPkg/Win: Enable 64bit (SEC,PEI,DXE all run at 64bit)"
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Pedroa Liu <pedroa....@outlook.com> diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 3abdab1db9..9ed59387d1 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -179,16 +179,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/EmulatorX64 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" ;; -- 2.17.1 在 2018/11/18 下午3:12, Jordan Justen 写道: > I think 32-bit version is incorrect too. > > Can you delete BUILD_OUTPUT_DIR from both IA32 and X64 cases, and > following the case use: > > BUILD_OUTPUT_DIR=$WORKSPACE/Build/Emulator$PROCESSOR > > Can you add this to the commit message: > > Fixes: f89c018f3d "EmulatorPkg/Win: Enable 64bit (SEC,PEI,DXE all run at > 64bit)" > > -Jordan > > On 2018-11-17 20:13:02, Liu Yu wrote: >> correction BUILD_OUTPUT_DIR path >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> >> Signed-off-by: Pedroa Liu <pedroa....@outlook.com> >> --- >> EmulatorPkg/build.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh >> index 339c6b3b4f..3abdab1db9 100755 >> --- a/EmulatorPkg/build.sh >> +++ b/EmulatorPkg/build.sh >> @@ -188,7 +188,7 @@ case $PROCESSOR in >> ;; >> X64) >> ARCH_SIZE=64 >> - BUILD_OUTPUT_DIR=$WORKSPACE/Build/Emulator >> + BUILD_OUTPUT_DIR=$WORKSPACE/Build/EmulatorX64 >> 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" >> ;; >> -- >> 2.17.1 >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
