diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-20 23:05:43 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-20 23:05:43 +0000 |
| commit | ea203f22151c12091013ecc44794b743b2a7728a (patch) | |
| tree | 052e39f6095c034cd0090892385b9b3be5809a27 | |
| parent | 53a6813fd09065fdbbc1c6dc11a136e072cd2388 (diff) | |
| download | edk2-ea203f22151c12091013ecc44794b743b2a7728a.zip edk2-ea203f22151c12091013ecc44794b743b2a7728a.tar.gz edk2-ea203f22151c12091013ecc44794b743b2a7728a.tar.bz2 | |
InOsEmuPkg: Make sure to skip DXE IPL on emulator build, and don't double build every thing IA-32 Xcode.
Signed-off-by: andrewfish
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11868 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | InOsEmuPkg/Unix/UnixX64.dsc | 2 | ||||
| -rwxr-xr-x | InOsEmuPkg/Unix/build.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/InOsEmuPkg/Unix/UnixX64.dsc index 995e0e5..4012acf 100644 --- a/InOsEmuPkg/Unix/UnixX64.dsc +++ b/InOsEmuPkg/Unix/UnixX64.dsc @@ -274,12 +274,14 @@ #
###################################################################################################
+!ifndef $(SKIP_MAIN_BUILD)
[Components.X64]
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
<LibraryClasses>
# turn off CR3 write so that DXE IPL will not crash emulator
BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf
}
+!endif
[Components.IA32]
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
diff --git a/InOsEmuPkg/Unix/build.sh b/InOsEmuPkg/Unix/build.sh index 4e2add8..24440de 100755 --- a/InOsEmuPkg/Unix/build.sh +++ b/InOsEmuPkg/Unix/build.sh @@ -121,7 +121,7 @@ done # echo $PATH echo `which build` -build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -D BUILD_32 -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules +build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -D BUILD_32 -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8 cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/SecMain $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32 exit $? |