UefiCpuPkg/MpInitLib: Skip reading PlatformId on AMD processors.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 5f6028deffb7cf211ed84dd7330331d73d40ef87..7b9377aaa5c2f6eeac2934e3e86d2356ecb7224a 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @REM\r
-@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
@@ -113,6 +113,18 @@ if not defined NASM_PREFIX (
     @if not exist "C:\nasm\nasm.exe" echo   Attempting to build modules that require NASM will fail.\r
 )\r
 \r
+:check_CLANGPDB\r
+@REM In Windows, set CLANG_HOST_BIN=n to use nmake command\r
+@set CLANG_HOST_BIN=n\r
+if not defined CLANG_BIN (\r
+    @echo.\r
+    @echo !!! WARNING !!! CLANG_BIN environment variable is not set\r
+    @if exist "C:\Program Files\LLVM\bin\clang.exe" (\r
+        @set CLANG_BIN=C:\Program Files\LLVM\bin\\r
+        @echo   Found LLVM, setting CLANG_BIN environment variable to C:\Program Files\LLVM\bin\\r
+    )\r
+)\r
+\r
 :check_cygwin\r
 if defined CYGWIN_HOME (\r
   if not exist "%CYGWIN_HOME%" (\r
@@ -133,6 +145,7 @@ if defined CYGWIN_HOME (
 :cygwin_done\r
 if /I "%1"=="Rebuild" shift\r
 if /I "%1"=="ForceRebuild" shift\r
+if /I "%1"=="VS2019" shift\r
 if /I "%1"=="VS2017" shift\r
 if /I "%1"=="VS2015" shift\r
 if /I "%1"=="VS2013" shift\r
@@ -141,7 +154,7 @@ if "%1"=="" goto end
 \r
 :Usage\r
   @echo.\r
-  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]"\r
+  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]"\r
   @echo.\r
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo         Rebuild        Perform incremental rebuild of BaseTools binaries.\r
@@ -150,6 +163,7 @@ if "%1"=="" goto end
   @echo         VS2013         Set the env for VS2013 build.\r
   @echo         VS2015         Set the env for VS2015 build.\r
   @echo         VS2017         Set the env for VS2017 build.\r
+  @echo         VS2019         Set the env for VS2019 build.\r
   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
   @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r