diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-23 15:23:02 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-23 15:23:02 +0000 |
| commit | feceaad588d424673c140fc02388f7b5c9cc1733 (patch) | |
| tree | 0caf807fee2de3ca52856282de04b8257b980604 | |
| parent | fe7e504faa6b0345981acfb06b33f59211cfd5af (diff) | |
| download | edk2-platforms-feceaad588d424673c140fc02388f7b5c9cc1733.tar.xz | |
InOsEmuPkg/Unix/build.sh: Merge changes from build64.sh r11867
Signed-off-by: jljusten
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11878 6f19259b-4bc3-4df7-8a09-765794883524
| -rwxr-xr-x | InOsEmuPkg/Unix/build.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/InOsEmuPkg/Unix/build.sh b/InOsEmuPkg/Unix/build.sh index fc214788d4..44df8115cf 100755 --- a/InOsEmuPkg/Unix/build.sh +++ b/InOsEmuPkg/Unix/build.sh @@ -40,7 +40,6 @@ fi # # Pick a default tool type for a given OS # -TARGET_TOOLS=MYTOOLS UNIXPKG_TOOLS=GCC44 NETWORK_SUPPORT= BUILD_NEW_SHELL= @@ -60,10 +59,13 @@ case `uname` in BUILD_NEW_SHELL="-D BUILD_NEW_SHELL" BUILD_FAT="-D BUILD_FAT" ;; - Linux*) TARGET_TOOLS=ELFGCC ;; - esac +if [ -z "$TARGET_TOOLS" ] +then + TARGET_TOOLS=$UNIXPKG_TOOLS +fi + BUILD_ROOT_ARCH=$WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32 if [[ ! -f `which build` || ! -f `which GenFv` ]]; @@ -119,10 +121,12 @@ done # # Build the edk2 UnixPkg # -echo $PATH -echo `which build` -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 +if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then + build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8 +else + build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD -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 +fi exit $? |