X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BeagleBoardPkg%2Fbuild.sh;h=ad8e69fc2478393027b24cb0b4a02f9ee526be8d;hb=5ec61d4152039097a4f5d319fa49799d6c6628ef;hp=3ce923e9ee5993b67b3729bbba855441f5409226;hpb=0641c5405cf66979307fb20d19f94bbd8424d341;p=mirror_edk2.git

diff --git a/BeagleBoardPkg/build.sh b/BeagleBoardPkg/build.sh
index 3ce923e9ee..ad8e69fc24 100755
--- a/BeagleBoardPkg/build.sh
+++ b/BeagleBoardPkg/build.sh
@@ -37,7 +37,7 @@ function process_debug_scripts {
 #
 # Setup workspace if it is not set
 #
-if [ -z "$WORKSPACE" ]
+if [ -z "${WORKSPACE:-}" ]
 then
   echo Initializing workspace
   cd ..
@@ -51,17 +51,22 @@ else
 fi
 
 #
-# Pick a default tool type for a given OS
+# Pick a default tool type for a given OS if no toolchain already defined
 #
-case `uname` in
-  CYGWIN*) 
+if [ -z "${TARGET_TOOLS:-}" ]
+then
+  case `uname` in
+    CYGWIN*) 
       TARGET_TOOLS=RVCT31CYGWIN 
       ;;
-  Linux*)  
-      # Not tested
-      TARGET_TOOLS=ARMGCC 
+    Linux*)  
+      if [[ ! -z `locate arm-linux-gnueabi-gcc` ]]; then
+        TARGET_TOOLS=ARMLINUXGCC
+      else 
+        TARGET_TOOLS=ARMGCC 
+      fi
       ;;
-  Darwin*) 
+    Darwin*) 
       Major=$(uname -r | cut -f 1 -d '.')
       if [[ $Major == 9 ]]
       then
@@ -71,7 +76,8 @@ case `uname` in
         TARGET_TOOLS=XCODE32
       fi  
       ;;
-esac
+  esac
+fi
 
 TARGET=DEBUG
 for arg in "$@"
@@ -99,9 +105,9 @@ fi
 # Build the edk2 BeagleBoard code
 #
 if [[ $TARGET == RELEASE ]]; then
-  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET -D DEBUG_TARGET=RELEASE $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET -D DEBUG_TARGET=RELEASE ${2:-} ${3:-} ${4:-} ${5:-} ${6:-} ${7:-} ${8:-}
 else
-  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET $1 $2 $3 $4 $5 $6 $7 $8
+  build -p ${WORKSPACE:-}/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET ${1:-} ${2:-} ${3:-} ${4:-} ${5:-} ${6:-} ${7:-} ${8:-}
 fi