X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;fp=BaseTools%2Ftoolsetup.bat;h=17b723954fa8021a49e62c16d439e63bfab86ddd;hp=21f5b76e4b1c641755ff1ea26b62297f79a85246;hb=92063b0b212ddc408dff163ede8e4ae36ba89400;hpb=0bfb9ee855d0433efdb2b0d6c9dfa6c310b66e9b

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 21f5b76e4b..17b723954f 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -4,6 +4,7 @@
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.
 @REM
 @REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 @REM
 @REM This program and the accompanying materials are licensed and made available
 @REM under the terms and conditions of the BSD License which accompanies this 
@@ -33,6 +34,9 @@ if /I "%1"=="/?" goto Usage
 :loop
   if "%1"=="" goto setup_workspace
   if /I "%1"=="--nt32" (
+    if /I "%2" == "X64" (
+      shift
+    )
     @REM Ignore --nt32 flag
     shift
     goto loop